##// 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

File last commit:

r39808:ae531f5e default
r45843:00e9c5ed default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer