Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix stray character in bid merge message stable
authorMads Kiilerich <madski@unity3d.com>
Mon, 21 Apr 2014 20:22:14 +0200
branchstable
changeset 21170 ea3972243320
parent 21169 b743077db69a
child 21171 33737ebc6f39
merge: fix stray character in bid merge message
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-merge-criss-cross.t file | annotate | diff | comparison | revisions 
--- 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
--- 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
hg-stable