diff -r 19e32420e150 -r 9fd15f27c91c tests/test-stabilize-conflict.t --- a/tests/test-stabilize-conflict.t Fri Oct 28 17:03:53 2016 +0200 +++ b/tests/test-stabilize-conflict.t Fri Oct 28 15:04:40 2016 -0700 @@ -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