Mercurial > hg
comparison tests/test-merge-tools.t @ 22707:38e0363dcbe0
filemerge: switch the default name for internal tools from internal:x to :x
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 28 Sep 2014 17:15:28 +0200 |
| parents | ad25986c4cd3 |
| children | 9d0b6ef92eb2 |
comparison
equal
deleted
inserted
replaced
| 22706:ad25986c4cd3 | 22707:38e0363dcbe0 |
|---|---|
| 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 |