Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test output
authorMatt Mackall <mpm@selenic.com>
Fri, 06 Oct 2006 17:14:50 -0500
changeset 3281 f49c90b46897
parent 3280 45b639607e52
child 3282 438b0638dbf5
child 3284 d89e98840b08
Update test output
tests/test-rename-merge2.out file | annotate | diff | comparison | revisions 
--- a/tests/test-rename-merge2.out	Fri Oct 06 17:14:18 2006 -0500
+++ b/tests/test-rename-merge2.out	Fri Oct 06 17:14:50 2006 -0500
@@ -302,7 +302,7 @@
 --------------
 
 --------------
-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 @@
 --------------
 
 --------------
-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 @@
 --------------
 
 --------------
-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