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

File last commit:

r29813:5f86818c default
r45841:31c454a5 default
Show More
map
2 lines | 45 B | text/plain | TextLexer
Matt Mackall
coal: use inheritance to derive from paper...
r29813 __base__ = ../paper/map
header = header.tmpl