# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1398104534 -7200
# Node ID ea3972243320b34f7c24de163f55ed3f1de58951
# Parent  b743077db69a88956a9136608358819337c5fb52
merge: fix stray character in bid merge message

diff -r b743077db69a -r ea3972243320 mercurial/merge.py
--- a/mercurial/merge.py	Mon Apr 21 20:18:42 2014 +0200
+++ b/mercurial/merge.py	Mon Apr 21 20:22:14 2014 +0200
@@ -782,7 +782,7 @@
                 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 -r b743077db69a -r ea3972243320 tests/test-merge-criss-cross.t
--- a/tests/test-merge-criss-cross.t	Mon Apr 21 20:18:42 2014 +0200
+++ b/tests/test-merge-criss-cross.t	Mon Apr 21 20:22:14 2014 +0200
@@ -327,7 +327,7 @@
    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