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

r9999:f91e5630 default
r45841:31c454a5 default
Show More
header.tmpl
1 line | 86 B | application/x-cheetah | CheetahLexer
<?xml version="1.0" encoding="{encoding}"?>
<feed xmlns="http://www.w3.org/2005/Atom">