Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-update-reverse.t
changeset 15625 efdcce3fd2d5
parent 12279 28e2e3804f2e
child 18360 760c0d67ce5e 
--- 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
mercurial