Mercurial > public > mercurial-scm > hg

diff tests/test-issue1175.t @ 28963:fc1d75e7a98d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: use single quotes around command hint Windows command lines use double quotes to quote arguments with spaces. This change is in a series to unify around using single quotes around commands, and double quotes around interior arguments.
author timeless <timeless@mozdev.org>
date Thu, 14 Apr 2016 15:19:57 +0000
parents cdb9493a7e2f
children 2f034a21778c
line wrap: on
line diff
--- 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