[PATCH 6 of 6 bid merge v2] [RFC] merge: take bids for merge actions for different ancestors and pick the best

[Matt Mackall]

On Tue, 2014-04-22 at 10:05 +0200, Martin Geisler wrote:
> I think it's pretty good -- adding a real --ancestor command line flag
> to merge would make it a little easier to discover this feature. But I
> take it that you want to keep this feature a little under the radar for
> now.

FYI, I plan to make multi-ancestor merge on-by-default after the freeze.

-- 
Mathematics is the supreme nostalgia of our time.