Mercurial > public > mercurial-scm > hg

diff tests/test-copy-move-merge.t @ 15625:efdcce3fd2d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make debug output easier to read I always found it hard to figure out what the debug code meant without the separators.
author Martin Geisler <mg@aragost.com>
date Fri, 09 Dec 2011 17:34:53 +0100
parents ffb5c09ba822
children e9ae770eff1c
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-copy-move-merge.t	Fri Dec 09 17:34:53 2011 +0100
@@ -29,8 +29,8 @@
      b -> a *
     checking for directory renames
   resolving manifests
-   overwrite None partial False
-   ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6
+   overwrite: False, partial: False
+   ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
    a: remote moved to c -> m
    a: remote moved to b -> m
   preserving a for resolve of b