##// 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
Gregory Szorc - - Load All Authors

File last commit:

r23399:fd5247a8 default
r49406:c6649c53 default
Show More
hgwebconfig
6 lines | 67 B | text/plain | TextLexer
/ contrib / docker / apache-server / hgwebconfig
History | Annotation | Raw |Copy content |Copy permalink
[paths]
/ = /var/hg/repos/*
[web]
allow_push = *
push_ssl = False