mercurial at 21126: 2 new changesets

Mercurial Commits hg at intevation.org
Thu Apr 17 16:30:13 CDT 2014


2 new changesets in mercurial:

http://selenic.com/repo/hg//rev/e94e90a4526e
changeset:   21125:e94e90a4526e
user:        Mads Kiilerich <madski at unity3d.com>
date:        Thu Apr 17 17:32:04 2014 +0200
summary:     context: tell when .ancestor picks one of multiple common ancestors heads

http://selenic.com/repo/hg//rev/99b5eaf372a7
changeset:   21126:99b5eaf372a7
tag:         tip
user:        Mads Kiilerich <madski at unity3d.com>
date:        Mon Feb 24 22:42:14 2014 +0100
summary:     context: introduce merge.preferancestor for controlling which ancestor to pick

-- 
Repository URL: http://selenic.com/repo/hg/


More information about the Mercurial-devel mailing list