Mercurial > hg

diff mercurial/localrepo.py @ 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 6b5a9a01f29d
children 3e86261bf110
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Sep 20 23:47:46 2016 +0000
+++ b/mercurial/localrepo.py	Tue Sep 20 23:48:08 2016 +0000
@@ -1625,8 +1625,8 @@
             ms = mergemod.mergestate.read(self)
 
             if list(ms.unresolved()):
-                raise error.Abort(_('unresolved merge conflicts '
-                                    '(see "hg help resolve")'))
+                raise error.Abort(_("unresolved merge conflicts "
+                                    "(see 'hg help resolve')"))
             if ms.mdstate() != 's' or list(ms.driverresolved()):
                 raise error.Abort(_('driver-resolved merge conflicts'),
                                   hint=_('run "hg resolve --all" to resolve'))