branch | stable |
changeset 21170 | ea3972243320 |
parent 21168 | 355058ad8405 |
child 21171 | 33737ebc6f39 |
--- 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