##// END OF EJS Templates
filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606
Martin von Zweigbergk -
r46755:3ca5ca38 default
Show More
Name Size Modified Last Commit Author
/ contrib / python-zstandard / zstd / decompress
huf_decompress.c Loading ...
zstd_ddict.c Loading ...
zstd_ddict.h Loading ...
zstd_decompress.c Loading ...
zstd_decompress_block.c Loading ...
zstd_decompress_block.h Loading ...
zstd_decompress_internal.h Loading ...