Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rename-merge1.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 ec5886db9dc6
children ad394c897b16
line wrap: on
line diff
--- a/tests/test-rename-merge1.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-rename-merge1.t	Fri Dec 09 17:34:53 2011 +0100
@@ -35,8 +35,8 @@
     checking for directory renames
    a2: divergent renames -> dr
   resolving manifests
-   overwrite None partial False
-   ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c
+   overwrite: False, partial: False
+   ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
    a: remote moved to b -> m
    b2: remote created -> g
   preserving a for resolve of b