##// END OF EJS Templates
simplemerge: convert `merge_lines()` away from generator...
simplemerge: convert `merge_lines()` away from generator We always consume all the lines and put them in a list anyway. By making the function not a generator, we can later make it return an additional value (to indicate if there were conflicts). Differential Revision: https://phab.mercurial-scm.org/D11973

File last commit:

r48657:f07a0054 stable
r49388:3f5bc446 default
Show More
requirements-windows.txt.in
19 lines | 413 B | text/plain | TextLexer
/ contrib / packaging / requirements-windows.txt.in
docutils
# Pinned to an old version because 0.20 drops Python 3 compatibility.
dulwich < 0.20 ; python_version <= '2.7'
dulwich ; python_version >= '3'
# Needed by the release note tooling
fuzzywuzzy
keyring
pygit2 ; python_version >= '3'
pygments
# Needed by the phabricator tests
pytest-vcr
# Need to list explicitly so dependency gets pulled in when
# not running on Windows.
pywin32-ctypes
windows-curses