tests/test-merge7.out
changeset 2019 ced2d3620f95
parent 1933 7544700fd931
child 2175 b2ae81a7df29
--- a/tests/test-merge7.out
+++ b/tests/test-merge7.out
@@ -4,7 +4,7 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg update' to get a working copy)
+(run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 merging test.txt
 merging test.txt failed!
@@ -14,7 +14,7 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg update' to get a working copy)
+(run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 resolving manifests
  force None allow 1 moddirstate True linear False