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

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

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
Victor Stinner - - Load All Authors

File last commit:

r47090:e92ca942 default
r47177:1a7d12c8 default
Show More
clang-format-ignorelist
12 lines | 367 B | text/plain | TextLexer
/ contrib / clang-format-ignorelist
History | Annotation | Raw |Copy content |Copy permalink
# Files that just need to be migrated to the formatter.
# Do not add new files here!
mercurial/cext/manifest.c
mercurial/cext/osutil.c
# Vendored code that we should never format:
syntax: glob
contrib/python-zstandard/**.c
contrib/python-zstandard/**.h
hgext/fsmonitor/pywatchman/**.c
mercurial/thirdparty/**.c
mercurial/thirdparty/**.h
mercurial/pythoncapi_compat.h