tests/test-stabilize-conflict.t
changeset 1767 f746f787f82c
parent 1756 a7dcfff8c4a9
child 1762 ad04f3c3b1a9
child 1780 3e270ed7ede0
--- a/tests/test-stabilize-conflict.t	Sun Oct 16 20:29:27 2016 +0200
+++ b/tests/test-stabilize-conflict.t	Sun Oct 30 23:31:31 2016 +0100
@@ -129,7 +129,7 @@
   merging babar
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
@@ -219,7 +219,7 @@
   was merge successful (yn)? n
   merging babar failed!
   evolve failed!
-  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
+  fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l