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-merge-commit.t
changeset 15625 efdcce3fd2d5
parent 14182 ec5886db9dc6
child 16913 f2719b387380 
--- a/tests/test-merge-commit.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-merge-commit.t	Fri Dec 09 17:34:53 2011 +0100
@@ -69,8 +69,8 @@
   $ hg --debug merge 3
     searching for copies back to rev 1
   resolving manifests
-   overwrite None partial False
-   ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28
+   overwrite: False, partial: False
+   ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
    bar: versions differ -> m
   preserving bar for resolve of bar
   updating: bar 1/1 files (100.00%)
@@ -156,8 +156,8 @@
   $ hg --debug merge 3
     searching for copies back to rev 1
   resolving manifests
-   overwrite None partial False
-   ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0
+   overwrite: False, partial: False
+   ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
    bar: versions differ -> m
   preserving bar for resolve of bar
   updating: bar 1/1 files (100.00%)
mercurial