##// END OF EJS Templates
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()...
merge: pass mergeresult obj instead of actions dict in _resolvetrivial() Differential Revision: https://phab.mercurial-scm.org/D8824
Pulkit Goyal -
r45843:00e9c5ed default
Show More
Name Size Modified Last Commit Author
/ mercurial / revlogutils
__init__.py Loading ...
constants.py Loading ...
deltas.py Loading ...
flagutil.py Loading ...
nodemap.py Loading ...
sidedata.py Loading ...