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

r42237:675775c3 default
r49410:69e76b2a default
Show More
MANIFEST.in
9 lines | 139 B | text/plain | TextLexer
graft c-ext
graft debian
graft zstd
graft tests
include make_cffi.py
include setup_zstd.py
include zstd.c
include LICENSE
include NEWS.rst