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-merge-criss-cross.t
changeset 23638 09be050ca98c
parent 23482 208ec8ca7c79
child 25125 bd625cd4e5e7 
--- a/tests/test-merge-criss-cross.t	Mon Dec 08 13:24:10 2014 -0800
+++ b/tests/test-merge-criss-cross.t	Thu Dec 11 20:56:53 2014 -0800
@@ -141,8 +141,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922
+   f1: versions differ -> m
    f2: remote unchanged -> k
-   f1: versions differ -> m
   
   auction for merging merge bids
    f1: picking 'get' action
@@ -184,8 +184,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5
+   f1: versions differ -> m
    f2: remote is newer -> g
-   f1: versions differ -> m
   
   auction for merging merge bids
    f1: picking 'keep' action
@@ -249,8 +249,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922
+   f1: versions differ -> m
    f2: remote unchanged -> k
-   f1: versions differ -> m
   
   auction for merging merge bids
    f1: picking 'get' action
Mercurial