Mercurial > hg

comparison tests/test-copy-move-merge.t @ 16795:e9ae770eff1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: show renamed on one and deleted on the other side in debug output
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 21:34:29 +0200
parents efdcce3fd2d5
children f2719b387380
comparison
equal deleted inserted replaced
16794:98687cdddcb1 16795:e9ae770eff1c
22 $ hg merge --debug 22 $ hg merge --debug
23 searching for copies back to rev 1 23 searching for copies back to rev 1
24 unmatched files in other: 24 unmatched files in other:
25 b 25 b
26 c 26 c
27 all copies found (* = to merge, ! = divergent): 27 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
28 c -> a * 28 c -> a *
29 b -> a * 29 b -> a *
30 checking for directory renames 30 checking for directory renames
31 resolving manifests 31 resolving manifests
32 overwrite: False, partial: False 32 overwrite: False, partial: False