Mercurial > public > mercurial-scm > hg

diff tests/test-merge7.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 2371f4aea665
children f2719b387380
line wrap: on
line diff
--- a/tests/test-merge7.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-merge7.t	Fri Dec 09 17:34:53 2011 +0100
@@ -81,8 +81,8 @@
   $ hg merge --debug
     searching for copies back to rev 1
   resolving manifests
-   overwrite None partial False
-   ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8
+   overwrite: False, partial: False
+   ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
    test.txt: versions differ -> m
   preserving test.txt for resolve of test.txt
   updating: test.txt 1/1 files (100.00%)