Mercurial > hg
comparison hgext/blackbox.py @ 21080:04540a8499a3
merge: move ancestor selection tweaking from manifestmerge to update function
- passing it through calculateupdates.
This will make sure manifestmerge actually use the ancestor it is given.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 06 Apr 2014 13:39:51 +0200 |
parents | 6d6f148cada9 |
children | 7cc77030c557 |
comparison
equal
deleted
inserted
replaced
21079:b02ab6486a78 | 21080:04540a8499a3 |
---|