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

r19905:078ccd78 default
r49389:912668d9 default
Show More
changelog.tmpl
5 lines | 67 B | application/x-cheetah | CheetahLexer
{header}
# HG changelog
# Node ID {node}
{entries%changelogentry}