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-rebase-interruptions.t
branchstable
changeset 12896 b19b4c1df066
parent 12608 16b854cb80f1
child 15501 2371f4aea665 
--- a/tests/test-rebase-interruptions.t	Mon Nov 01 10:24:07 2010 +0100
+++ b/tests/test-rebase-interruptions.t	Sat Oct 30 16:58:15 2010 -0500
@@ -57,7 +57,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on C during the interruption:
@@ -89,7 +89,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Solve the conflict and go on:
@@ -143,7 +143,7 @@
   merging A
   warning: conflicts during merge.
   merging A failed!
-  abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
   [255]
 
 Force a commit on B' during the interruption:
mercurial