Mercurial > public > mercurial-scm > hg-stable

diff tests/test-update-reverse.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 28e2e3804f2e
children 760c0d67ce5e
line wrap: on
line diff
--- a/tests/test-update-reverse.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-update-reverse.t	Fri Dec 09 17:34:53 2011 +0100
@@ -66,8 +66,8 @@
 
   $ hg update --debug -C 1
   resolving manifests
-   overwrite True partial False
-   ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf
+   overwrite: True, partial: False
+   ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
    side2: other deleted -> r
    side1: other deleted -> r
    main: remote created -> g