tests/test-issue1175.t

--- a/tests/test-issue1175.t	Thu Apr 14 15:18:59 2016 +0000
+++ b/tests/test-issue1175.t	Thu Apr 14 15:19:57 2016 +0000
@@ -72,7 +72,7 @@
   merging b
   warning: conflicts while merging b! (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]
   $ echo a > b
   $ echo b3 >> b