Mercurial > hg
view contrib/clang-format-ignorelist @ 46169:714085c1b800
mergetools: enable the `checkconflicts` option for Araxis Merge
This must have been a typo. This matches the config read in filemerge, as well
as the TortoiseHg config file.
Differential Revision: https://phab.mercurial-scm.org/D9633
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 19 Dec 2020 01:15:44 -0500 |
parents | 98944715a02c |
children | e92ca942ddca |
line wrap: on
line source
# 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