##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r16442:9181188f default
r49410:69e76b2a default
Show More
factotum.rc
4 lines | 128 B | text/x-stsrc | TextLexer
# The factotum extension permits factotum(4) to act as an
# authentication agent for HTTP repositories.
[extensions]
factotum =