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-rename-dir-merge.t
changeset 15625 efdcce3fd2d5
parent 15447 9910f60a37ee
child 16094 0776a6cababe 
--- a/tests/test-rename-dir-merge.t	Fri Dec 09 15:50:33 2011 +0100
+++ b/tests/test-rename-dir-merge.t	Fri Dec 09 17:34:53 2011 +0100
@@ -39,8 +39,8 @@
     file a/c -> b/c
     file a/d -> b/d
   resolving manifests
-   overwrite None partial False
-   ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
+   overwrite: False, partial: False
+   ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740
    a/d: remote renamed directory to b/d -> d
    a/c: remote renamed directory to b/c -> d
    a/b: other deleted -> r
@@ -94,8 +94,8 @@
     dir a/ -> b/
     file a/c -> b/c
   resolving manifests
-   overwrite None partial False
-   ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
+   overwrite: False, partial: False
+   ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb
    None: local renamed directory to b/c -> d
   updating:None 1/1 files (100.00%)
   getting a/c to b/c
mercurial