Mercurial > public > mercurial-scm > hg-stable
view contrib/clang-format-ignorelist @ 48607:07069fcd9a6e
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
We currently pass around pairs of file context objects and labels
between functions in the `filemerge` module. I plan to pass around
`simplemerge.MergeInput` instead. This patch prepares for that by
using the type internally in `filemerge.filemerge()`.
Differential Revision: https://phab.mercurial-scm.org/D12017
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:42:50 -0800 |
parents | e92ca942ddca |
children |
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 mercurial/pythoncapi_compat.h