Mercurial > hg

diff 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
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Wed May 23 20:50:16 2012 +0200
+++ b/tests/test-copy-move-merge.t	Wed May 23 21:34:29 2012 +0200
@@ -24,7 +24,7 @@
     unmatched files in other:
      b
      c
-    all copies found (* = to merge, ! = divergent):
+    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      c -> a *
      b -> a *
     checking for directory renames