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

r19905:078ccd78 default
r45843:00e9c5ed default
Show More
changelog.tmpl
5 lines | 67 B | application/x-cheetah | CheetahLexer
{header}
# HG changelog
# Node ID {node}
{entries%changelogentry}