Mercurial Mercurial > hg-stable / 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
branchstable
changeset 21168 355058ad8405
parent 21167 1ce131b3221e
child 21170 ea3972243320 
--- a/mercurial/merge.py	Mon Apr 21 15:08:39 2014 -0500
+++ b/mercurial/merge.py	Mon Apr 21 19:53:19 2014 +0200
@@ -777,7 +777,7 @@
                     continue
             # TODO: Consider other simple actions such as mode changes
             # Handle inefficient democrazy.
-            repo.ui.note(_(' %s: multiple merge bids:\n') % (f, m))
+            repo.ui.note(_(' %s: multiple merge bids:\n') % f)
             for a in bidsl:
                 repo.ui.note('  %s: %s\n' % (f, a[1]))
             # Pick random action. TODO: Instead, prompt user when resolving
hg-stable