##// END OF EJS Templates
diff: add experimental support for "merge diffs"...
diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

File last commit:

r47036:e74274fc default
r47177:1a7d12c8 default
Show More
requirements-windows.txt.in
11 lines | 316 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'
keyring
pygit2 ; python_version >= '3'
pygments
# Need to list explicitly so dependency gets pulled in when
# not running on Windows.
pywin32-ctypes
windows-curses