##// END OF EJS Templates
merge: pass mergeresult in checkpassconflicts() instead of actions (API)...
merge: pass mergeresult in checkpassconflicts() instead of actions (API) This is a part of series which aims to use mergeresult obj instead of an action dictionary. Differential Revision: https://phab.mercurial-scm.org/D8822
Pulkit Goyal -
r45841:31c454a5 default
Show More
Name Size Modified Last Commit Author
/ mercurial / pure
__init__.py Loading ...
base85.py Loading ...
bdiff.py Loading ...
charencode.py Loading ...
mpatch.py Loading ...
osutil.py Loading ...
parsers.py Loading ...