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

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

filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606
Matt Harbison - - Load All Authors

File last commit:

r46596:d2649781 default
r46755:3ca5ca38 default
Show More
requirements-windows.txt.in
10 lines | 301 B | text/plain | TextLexer
/ contrib / packaging / requirements-windows.txt.in
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
contrib: split Windows requirements into multiple files...
 r46344 docutils
# Pinned to an old version because 0.20 drops Python 3 compatibility.
dulwich < 0.20 ; python_version <= '2.7'
dulwich ; python_version >= '3'
keyring
Matt Harbison
packaging: add pygit2 to the py3 Windows installers...
 r46596 pygit2 ; python_version >= '3'
Gregory Szorc
contrib: split Windows requirements into multiple files...
 r46344 pygments
# Need to list explicitly so dependency gets pulled in when
# not running on Windows.
pywin32-ctypes