diff -r c92b286ab6f1 -r e2585c6cdbdc tests/test-evolve.t --- a/tests/test-evolve.t Fri Oct 28 16:34:57 2016 +0200 +++ b/tests/test-evolve.t Sat Oct 29 15:01:41 2016 +0200 @@ -115,7 +115,7 @@ 1 public $ hg prune 1 abort: cannot prune immutable changeset: 7c3bad9141dc - (see "hg help phases" for details) + (see 'hg help phases' for details) [255] $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' 1 public @@ -1246,7 +1246,7 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg uncommit --all new changeset is empty - (use "hg prune ." to remove it) + (use 'hg prune .' to remove it) $ glog -r "18::" @ 26:044804d0c10d@default(draft) add j1 | @@ -1427,7 +1427,7 @@ merging newfile warning: conflicts while merging newfile! (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]