[PATCH 3 of 5 stable bid] merge: fix stray character in bid merge message
Mads Kiilerich
mads at kiilerich.com
Tue Apr 22 00:24:18 UTC 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1398104534 -7200
# Mon Apr 21 20:22:14 2014 +0200
# Branch stable
# Node ID bb27c515f6d4f902ab4f5b91d1fca5d8dfe7b1aa
# Parent cced6ee777ace47d56139976333df039c4af913a
merge: fix stray character in bid merge message
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -782,7 +782,7 @@ def calculateupdates(repo, wctx, mctx, a
repo.ui.note(' %s: %s\n' % (f, a[1]))
# Pick random action. TODO: Instead, prompt user when resolving
a0 = bidsl[0]
- repo.ui.warn(_(' %s: ambiguous merge - picked %s action)\n') %
+ repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') %
(f, a0[1]))
actions.append(a0)
continue
diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t
+++ b/tests/test-merge-criss-cross.t
@@ -327,7 +327,7 @@ http://stackoverflow.com/questions/93500
x: multiple merge bids:
x: m
x: m
- x: ambiguous merge - picked m action)
+ x: ambiguous merge - picked m action
end of auction
merging x
More information about the Mercurial-devel
mailing list