Mercurial Mercurial > hg / 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 23917 3cbb5bf4035d
parent 23903 426607be9c69
child 23929 a43fdf33a6be 
--- a/mercurial/localrepo.py	Sat Jan 17 18:08:47 2015 -0800
+++ b/mercurial/localrepo.py	Sat Jan 17 22:01:14 2015 -0200
@@ -1367,8 +1367,8 @@
             ms = mergemod.mergestate(self)
             for f in status.modified:
                 if f in ms and ms[f] == 'u':
-                    raise util.Abort(_("unresolved merge conflicts "
-                                       "(see hg help resolve)"))
+                    raise util.Abort(_('unresolved merge conflicts '
+                                       '(see "hg help resolve")'))
 
             if editor:
                 cctx._text = editor(self, cctx, subs)
Mercurial