##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r48657:f07a0054 stable
r49393:e8f1414c 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