Mercurial > public > mercurial-scm > hg-stable

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