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

r16773:d490edc7 default
r49389:912668d9 default
Show More
graph.tmpl
6 lines | 76 B | application/x-cheetah | CheetahLexer
{header}
# HG graph
# Node ID {node}
# Rows shown {rows}
{nodes%graphnode}