diff tests/test-stabilize-result.t @ 1762:ad04f3c3b1a9 mercurial-3.5

merge with latest fix

--- a/tests/test-stabilize-result.t	Fri Oct 28 16:59:32 2016 +0200
+++ b/tests/test-stabilize-result.t	Sat Oct 29 15:04:23 2016 +0200
@@ -85,7 +85,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, 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
@@ -224,7 +224,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ mv a a.old
   $ echo 'jungle' > a
   $ cat a.old >> a
@@ -337,7 +337,7 @@
   $ hg up --hidden 15
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete!
-  (use "hg evolve" to update to its successor)
+  (use 'hg evolve' to update to its successor)
   $ echo 'gotta break' >> a
   $ hg amend
   2 new divergent changesets
@@ -361,7 +361,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort
   abort: merge conflict between several amendments (this is not automated yet)
   (/!\ You can try:
   /!\ * manual merge + resolve => new cset X