Mercurial > hg

comparison mercurial/merge.py @ 21170:ea3972243320 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix stray character in bid merge message
author Mads Kiilerich <madski@unity3d.com>
date Mon, 21 Apr 2014 20:22:14 +0200
parents 355058ad8405
children 33737ebc6f39
comparison
equal deleted inserted replaced
21169:b743077db69a 21170:ea3972243320
780 repo.ui.note(_(' %s: multiple merge bids:\n') % f) 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') %
786 (f, a0[1])) 786 (f, a0[1]))
787 actions.append(a0) 787 actions.append(a0)
788 continue 788 continue
789 repo.ui.note(_('end of auction\n\n')) 789 repo.ui.note(_('end of auction\n\n'))
790 790