tests/test-evolve.t
changeset 1673 8e879d59b20e
parent 1641 27445da063b7
child 1685 4fd0db2f6d84
--- a/tests/test-evolve.t	Fri Sep 14 11:32:28 2012 -0400
+++ b/tests/test-evolve.t	Tue Apr 19 14:29:40 2016 -0700
@@ -594,7 +594,7 @@
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue)
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 stable