Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-merge2.out
changeset 3282 f49c90b46897
parent 3280 ae85272b59a4
child 3288 438b0638dbf5 
--- a/tests/test-rename-merge2.out
+++ b/tests/test-rename-merge2.out
@@ -302,7 +302,7 @@ M b
 --------------
 
 --------------
-test L:nc a b R:up a b W:       - 16 merge a, merge b no ancestor
+test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
@@ -325,7 +325,7 @@ M b
 --------------
 
 --------------
-test L:up a b R:nc a b W:       - 17 merge a, merge b no ancestor
+test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
@@ -369,7 +369,7 @@ M b
 --------------
 
 --------------
-test L:up a b R:nm a b W:       - 19 merge b no ancestor, remove a
+test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
mercurial-crew-with-dirclash