[PATCH 9 of 9 cah] context: introduce [ui]topancestors for controlling which ancestor to pick

[Mads Kiilerich]

On 04/18/2014 02:38 PM, Martin Geisler wrote:
> Mads Kiilerich <mads at kiilerich.com> writes:
>
>> # HG changeset patch
>> # User Mads Kiilerich <madski at unity3d.com>
>> # Date 1393278134 -3600
>> #      Mon Feb 24 22:42:14 2014 +0100
>> # Node ID 99a34ba33e8ea1dd81c648cb6558b47809d7923b
>> # Parent  ba5e0b1e2289a34a35522d94d7e7b96ba244120d
>> context: introduce [ui]topancestors for controlling which ancestor to pick
>>
>> Multiple revisions can be specified in ui.topancestors, separated by whitespace.
>> First match wins.
> You call it ui.bestancestors in the code.

Yes, it was a frantic attempt at getting in before the deadline.

But it made it, as merge.preferancestor - 
http://selenic.com/repo/hg/rev/99b5eaf372a7 .

/Mads