##// 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:

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
History | Annotation | Raw |Copy content |Copy permalink
# black pulls in typed-ast, which doesn't install on PyPy.
black==19.10b0 ; python_version >= '3.6' and platform_python_implementation != 'PyPy'
# Bazaar doesn't work with Python 3 nor PyPy.
bzr ; python_version <= '2.7' and platform_python_implementation == 'CPython'
docutils
fuzzywuzzy
# isort 5.0 drops support for Python 3.5. We can remove this line when we
# drop support for 3.5.
isort < 5.0
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