Patchwork [1,of,5,stable,bid] merge: fix wrong number of arguments for bid merge message

login
register
mail settings
Submitter Mads Kiilerich
Date April 22, 2014, 12:24 a.m.
Message ID <40a0fe8ec313c9cbf903.1398126256@localhost.localdomain>
Download mbox | patch
Permalink /patch/4417/
State Accepted
Commit 355058ad84056ae6836115960982dffa480d6622
Headers show

Comments

Mads Kiilerich - April 22, 2014, 12:24 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1398102799 -7200
#      Mon Apr 21 19:53:19 2014 +0200
# Branch stable
# Node ID 40a0fe8ec313c9cbf903d31a7832d9d24d9c09c7
# Parent  1ce131b3221e69fd643a52e3861707ea02a8a483
merge: fix wrong number of arguments for bid merge message

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -777,7 +777,7 @@  def calculateupdates(repo, wctx, mctx, a
                     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