##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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
Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default
r49389:912668d9 default
Show More
filediff.tmpl
5 lines | 27 B | application/x-cheetah | CheetahLexer
/ mercurial / templates / raw / filediff.tmpl
History | Annotation | Raw |Copy content |Copy permalink
{header}
{diff}
{footer}