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/merge.py
changeset 31175 7433b3bc55ee
parent 31168 41a9edc5d00f
child 31257 11831d755b51 
--- a/mercurial/merge.py	Mon Mar 06 23:19:57 2017 -0800
+++ b/mercurial/merge.py	Mon Mar 06 23:21:27 2017 -0800
@@ -1602,8 +1602,8 @@
         if updatecheck == 'noconflict':
             for f, (m, args, msg) in actionbyfile.iteritems():
                 if m not in ('g', 'k', 'r'):
-                    msg = _("uncommitted changes")
-                    hint = _("commit or update --merge to allow merge")
+                    msg = _("conflicting changes")
+                    hint = _("commit or update --clean to discard changes")
                     raise error.Abort(msg, hint=hint)
 
         # Prompt and create actions. Most of this is in the resolve phase
mercurial