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