##// END OF EJS Templates
merge: move ancestor selection tweaking from manifestmerge to update function...
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.
Mads Kiilerich -
r21080:04540a84 default
Show More
Name Size Modified Last Commit Author
/ mercurial / pure
__init__.py Loading ...
base85.py Loading ...
bdiff.py Loading ...
diffhelpers.py Loading ...
mpatch.py Loading ...
osutil.py Loading ...
parsers.py Loading ...