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

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

tests: demonstrate how conflict markers end up $local *and* $output...
tests: demonstrate how conflict markers end up $local *and* $output When a merge tool is configured to keep conflict markers, they are supposed to be written to `$local` if `$output` is not mentioned in the tool's `merge-tools.<tool>.args` config, and in `$output` if it is mentioned. However, I broke the latter case in D12190. Differential Revision: https://phab.mercurial-scm.org/D12378
Gregory Szorc - - Load All Authors

File last commit:

r49704:ec6a4021 default
r49822:b10a944c stable
Show More
requirements-windows.txt.in
19 lines | 413 B | text/plain | TextLexer
/ contrib / packaging / requirements-windows.txt.in
History | Annotation | Raw |Copy content |Copy permalink
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