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

r9999:f91e5630 default
r49389:912668d9 default
Show More
changeset.tmpl
9 lines | 124 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
# HG changeset patch
# User {author}
# Date {date|hgdate}
# Node ID {node}
{parent%changesetparent}
{desc}
{diff}