##// END OF EJS Templates
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

File last commit:

r46284:9934920a default
r49412:ad0c6bf6 default
Show More
linux-requirements.txt.in
17 lines | 622 B | text/plain | TextLexer
/ contrib / automation / linux-requirements.txt.in
Gregory Szorc
automation: install black...
r43718 # black pulls in typed-ast, which doesn't install on PyPy.
Gregory Szorc
automation: upgrade packages in Linux environment...
r46284 black==19.10b0 ; python_version >= '3.6' and platform_python_implementation != 'PyPy'
Gregory Szorc
automation: initial support for running Linux tests...
r42471 # Bazaar doesn't work with Python 3 nor PyPy.
bzr ; python_version <= '2.7' and platform_python_implementation == 'CPython'
docutils
fuzzywuzzy
Gregory Szorc
automation: upgrade packages in Linux environment...
r46284 # isort 5.0 drops support for Python 3.5. We can remove this line when we
# drop support for 3.5.
isort < 5.0
Gregory Szorc
automation: initial support for running Linux tests...
r42471 pyflakes
pygments
pylint
# Needed to avoid warnings from fuzzywuzzy.
python-Levenshtein
# typed-ast dependency doesn't install on PyPy.
typed-ast ; python_version >= '3.0' and platform_python_implementation != 'PyPy'
vcrpy