Mercurial > hg
comparison COPYING @ 22180:17011b36aac7 stable
changectx: ancestor should only prefer merge.preferancestor if it is a revision
The value '*' currently designates that bid merge should be used. The best
way to test bid merge is to set preferancestor=* in the configuration file ...
but then it would abort with unknown revision '*' when other code paths ended
up in changectx.ancestor .
Instead, just skip and ignore the value '*' when looking for a preferred
ancestor.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 15 Aug 2014 02:46:44 +0200 |
parents | 8c8b55733cbd |
children |
comparison
equal
deleted
inserted
replaced
22179:46308fadaa15 | 22180:17011b36aac7 |
---|