##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

simplemerge: make minimize() a free function...
simplemerge: make minimize() a free function IMO, `Merge3Text` should be about merging text without knowing about conflict markers. "Conflict minimization" is about making conflict markers smaller, so it should be moved out. This patch does that. I'll refactor it next. Differential Revision: https://phab.mercurial-scm.org/D11980
Gregory Szorc - - Load All Authors

File last commit:

r42237:675775c3 default
r49412:ad0c6bf6 default
Show More
MANIFEST.in
9 lines | 139 B | text/plain | TextLexer
/ contrib / python-zstandard / MANIFEST.in
History | Annotation | Raw |Copy content |Copy permalink
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