##// END OF EJS Templates
merge: check that there are no conflicts after --abort...
merge: check that there are no conflicts after --abort Same idea as in abcc82bf0717 (clean: check that there are no conflicts after, 2020-01-24). We should reuse more code here, but that will come later. Differential Revision: https://phab.mercurial-scm.org/D7994

File last commit:

r44489:98944715 default
r44636:2b6632d6 default
Show More
clang-format-ignorelist
11 lines | 337 B | text/plain | TextLexer
/ contrib / clang-format-ignorelist
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