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-histedit-fold.t
changeset 18934 93f3a06b2035
parent 18648 76b69cccb07a
child 18935 e5d9441ec281 
--- a/tests/test-histedit-fold.t	Fri Feb 08 16:27:59 2013 -0600
+++ b/tests/test-histedit-fold.t	Fri Feb 08 16:27:49 2013 -0600
@@ -182,7 +182,7 @@
   merging file
   warning: conflicts during merge.
   merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: Fix up the change and run hg histedit --continue
+  Fix up the change and run hg histedit --continue
   [255]
 There were conflicts, we keep P1 content. This
 should effectively drop the changes from +6.
@@ -247,7 +247,7 @@
   merging file
   warning: conflicts during merge.
   merging file incomplete! (edit conflicts, then use 'hg resolve --mark')
-  abort: Fix up the change and run hg histedit --continue
+  Fix up the change and run hg histedit --continue
   [255]
   $ cat > file << EOF
   > 1
mercurial