Mercurial > hg

changeset 21168:355058ad8405 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix wrong number of arguments for bid merge message
author Mads Kiilerich <madski@unity3d.com>
date Mon, 21 Apr 2014 19:53:19 +0200
parents 1ce131b3221e
children b743077db69a
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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