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

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

merge: consider the file merged when using :merge-{local,other}...
merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See 6217040b2780 and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999
Victor Stinner - - Load All Authors

File last commit:

r47090:e92ca942 default
r49415:50de0890 default
Show More
clang-format-ignorelist
12 lines | 367 B | text/plain | TextLexer
/ contrib / clang-format-ignorelist
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
contrib: rename clang-format-blacklist to clang-format-ignorelist...
 r37201 # 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:
Kyle Lippincott
fix: convert clang-format-ignorelist to use wildcards...
 r44489 syntax: glob
contrib/python-zstandard/**.c
contrib/python-zstandard/**.h
hgext/fsmonitor/pywatchman/**.c
mercurial/thirdparty/**.c
mercurial/thirdparty/**.h
Victor Stinner
cext: add Python 3.10 support...
 r47090 mercurial/pythoncapi_compat.h