##// END OF EJS Templates
simplemerge: make merge_lines() a free function...
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974

File last commit:

r18526:9409aeaa stable
r49389:912668d9 default
Show More
header.tmpl
5 lines | 149 B | application/x-cheetah | CheetahLexer
<?xml version="1.0" encoding="{encoding}"?>
<rss version="2.0">
<channel>
<link>{urlbase}{url|urlescape}</link>
<language>en-us</language>