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

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

simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels...
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels Before this patch, we use a combination of `mode` and `labels` to decide which marker style to use. That's mostly my own fault because I was the one who added the `mergediff` as a "mode" instead of adding a separate argument for marker style. Still, let's make these arguments more orthogonal by ignoring the number of labels when deciding which marker style to use. This refactoring makes it a little clearer in the simplemerge *extension* that passing more than 2 `--label` arguments changes the marker style. Differential Revision: https://phab.mercurial-scm.org/D11972
Victor Stinner - - Load All Authors

File last commit:

r47090:e92ca942 default
r49404:c9141848 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