##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r9999:f91e5630 default
r49410:69e76b2a 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">