merge: fix stray character in bid merge message

mercurial/merge.py

@@ -782,7 +782,7 b' 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

tests/test-merge-criss-cross.t

@@ -327,7 +327,7 b' 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