Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 29975 c15f06109b7a
parent 29962 6b5a9a01f29d
child 30187 3e86261bf110 
--- 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'))
mercurial