Mercurial Mercurial > hg / 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-rename-merge1.t
changeset 15625 efdcce3fd2d5
parent 14182 ec5886db9dc6
child 16792 ad394c897b16 
--- 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
Mercurial