##// 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
Martin von Zweigbergk -
r49389:912668d9 default
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / raw
__init__.py Loading ...
changelog.tmpl Loading ...
changeset.tmpl Loading ...
error.tmpl Loading ...
fileannotate.tmpl Loading ...
filediff.tmpl Loading ...
graph.tmpl Loading ...
graphedge.tmpl Loading ...
graphnode.tmpl Loading ...
index.tmpl Loading ...
logentry.tmpl Loading ...
manifest.tmpl Loading ...
map Loading ...
notfound.tmpl Loading ...
search.tmpl Loading ...