Mercurial > hg
comparison mercurial/merge.py @ 21168:355058ad8405 stable
merge: fix wrong number of arguments for bid merge message
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 21 Apr 2014 19:53:19 +0200 |
| parents | 1ce131b3221e |
| children | ea3972243320 |
comparison
equal
deleted
inserted
replaced
| 21167:1ce131b3221e | 21168:355058ad8405 |
|---|---|
| 775 repo.ui.note(" %s: picking 'get' action\n" % f) | 775 repo.ui.note(" %s: picking 'get' action\n" % f) |
| 776 actions.append(ga0) | 776 actions.append(ga0) |
| 777 continue | 777 continue |
| 778 # TODO: Consider other simple actions such as mode changes | 778 # TODO: Consider other simple actions such as mode changes |
| 779 # Handle inefficient democrazy. | 779 # Handle inefficient democrazy. |
| 780 repo.ui.note(_(' %s: multiple merge bids:\n') % (f, m)) | 780 repo.ui.note(_(' %s: multiple merge bids:\n') % f) |
| 781 for a in bidsl: | 781 for a in bidsl: |
| 782 repo.ui.note(' %s: %s\n' % (f, a[1])) | 782 repo.ui.note(' %s: %s\n' % (f, a[1])) |
| 783 # Pick random action. TODO: Instead, prompt user when resolving | 783 # Pick random action. TODO: Instead, prompt user when resolving |
| 784 a0 = bidsl[0] | 784 a0 = bidsl[0] |
| 785 repo.ui.warn(_(' %s: ambiguous merge - picked %s action)\n') % | 785 repo.ui.warn(_(' %s: ambiguous merge - picked %s action)\n') % |