##// 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 / templates / atom
bookmarkentry.tmpl Loading ...
bookmarks.tmpl Loading ...
branchentry.tmpl Loading ...
branches.tmpl Loading ...
changelog.tmpl Loading ...
changelogentry.tmpl Loading ...
error.tmpl Loading ...
filelog.tmpl Loading ...
header.tmpl Loading ...
map Loading ...
tagentry.tmpl Loading ...
tags.tmpl Loading ...