##// 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
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 graft c-ext
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 graft debian
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 graft zstd
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 graft tests
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 include make_cffi.py
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 include setup_zstd.py
include zstd.c
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
r37513 include LICENSE
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
r40157 include NEWS.rst