Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-conflicts.t @ 29975:c15f06109b7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: use single quotes in use warning
author timeless <timeless@mozdev.org>
date Tue, 20 Sep 2016 23:48:08 +0000
parents 3e7ded768556
children 0accd5a5ad04
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-rebase-conflicts.t	Tue Sep 20 23:48:08 2016 +0000
@@ -75,7 +75,7 @@
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"
-  abort: unresolved merge conflicts (see "hg help resolve")
+  abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
 
 Conclude rebase: