Mercurial > public > mercurial-scm > hg-stable

diff tests/test-double-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 4c94b6d0fb1c
children e9ae770eff1c
line wrap: on
line diff
--- a/tests/test-double-merge.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-double-merge.t	Fri Dec 09 17:34:53 2011 +0100
@@ -33,8 +33,8 @@
      bar -> foo *
     checking for directory renames
   resolving manifests
-   overwrite None partial False
-   ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104
+   overwrite: False, partial: False
+   ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
    foo: versions differ -> m
    foo: remote copied to bar -> m
   preserving foo for resolve of bar