tests/test-stabilize-result.t
branchstable
changeset 1753 9fd15f27c91c
parent 1737 5383671ef612
child 1755 6c78a5470583
--- a/tests/test-stabilize-result.t	Fri Oct 28 17:03:53 2016 +0200
+++ b/tests/test-stabilize-result.t	Fri Oct 28 15:04:40 2016 -0700
@@ -84,7 +84,7 @@
   merging a
   warning: conflicts while merging a! (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 revert -r 'unstable()' a