##// 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
Martin von Zweigbergk -
r49410:69e76b2a default
Show More
Name Size Modified Last Commit Author
/ contrib / python-zstandard / c-ext
bufferutil.c Loading ...
compressionchunker.c Loading ...
compressiondict.c Loading ...
compressionparams.c Loading ...
compressionreader.c Loading ...
compressionwriter.c Loading ...
compressobj.c Loading ...
compressor.c Loading ...
compressoriterator.c Loading ...
constants.c Loading ...
decompressionreader.c Loading ...
decompressionwriter.c Loading ...
decompressobj.c Loading ...
decompressor.c Loading ...
decompressoriterator.c Loading ...
frameparams.c Loading ...
python-zstandard.h Loading ...