Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 13541:919174c0aaff stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve unresolved merge conflicts warning (issue2681) Suggested by Antoine Pitrou <pitrou@free.fr>
author Patrick Mezard <pmezard@gmail.com>
date Sun, 06 Mar 2011 15:21:50 +0100
parents 8ac1260941c0
children 31eac42d9123 044e1356327d
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Mar 04 19:21:12 2011 -0600
+++ b/mercurial/localrepo.py	Sun Mar 06 15:21:50 2011 +0100
@@ -976,7 +976,7 @@
             for f in changes[0]:
                 if f in ms and ms[f] == 'u':
                     raise util.Abort(_("unresolved merge conflicts "
-                                                    "(see hg resolve)"))
+                                       "(see hg help resolve)"))
 
             cctx = context.workingctx(self, text, user, date, extra, changes)
             if editor: