diff -r 6c78a5470583 -r a7dcfff8c4a9 tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Fri Oct 28 17:11:43 2016 -0700 +++ b/tests/test-stabilize-result.t Fri Oct 28 17:15:57 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 @@ -223,7 +223,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 @@ -336,7 +336,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