equal
deleted
inserted
replaced
968 $ rm f |
968 $ rm f |
969 $ ln -s symlink f |
969 $ ln -s symlink f |
970 $ hg commit -qm 'f is symlink' |
970 $ hg commit -qm 'f is symlink' |
971 $ hg merge -r 2 --tool internal:merge |
971 $ hg merge -r 2 --tool internal:merge |
972 merging f |
972 merging f |
973 warning: internal:merge cannot merge symlinks for f |
973 warning: internal :merge cannot merge symlinks for f |
974 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
974 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
975 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
975 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
976 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
976 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
977 [1] |
977 [1] |
978 |
978 |