Adding merge --ancestor option?

[Na'Tosha Bard]

2012/3/13 Greg Ward <greg at gerg.ca>

> Hi all --
>
> at work, we regularly get bitten by ambiguous merge ancestors: if two
> common ancestors have the same distance from the root and both are the
> maximum distance, ancestor() picks the first one it sees. Sometimes it
> picks wrong and the user gets stuck resolving a conflict that 1) is
> not of his making and 2) has already been resolved by someone else.
>

Interesting.  I've noticed this happening to us sometimes, too.  I suspect
it could be from the same cause.

-- 
*Na'Tosha Bard*
Build & Infrastructure Developer | Unity Technologies - Copenhagen

*E-Mail:* natosha at unity3d.com
*Skype:* natosha.bard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120313/4697de1e/attachment.html>