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

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

simplemerge: change _minimize() to minimize a single conflict...
simplemerge: change _minimize() to minimize a single conflict `_minimize()` is weird in that it changes `a_lines` and `b_lines` but leaves `base_lines` unchanged, which means they'll be inconsistent. That was fine because the caller never used `base_lines`. With the recent refactorings of this code, we can now make this function cleaner by having it minimize a single conflict and not care about `base_lines`. This also makes the code simpler and makes the code for each `render_*()` function more similar. Differential Revision: https://phab.mercurial-scm.org/D11981
Victor Stinner - - Load All Authors

File last commit:

r47090:e92ca942 default
r49413:c2537aec 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