view .clang-format @ 39392:5d00e6061ba2

resolve: add a flag for the default behavior of re-merging

On its own, it's not useful, but the next commit will add an hgrc
config option to make it mandatory.

There is no short option, as -r almost always means --rev and this
option doesn't seem like it would be so common as to mandate a short
option.

Differential Revision: https://phab.mercurial-scm.org/D4378

BasedOnStyle: LLVM
IndentWidth: 8
UseTab: ForIndentation
BreakBeforeBraces: Linux
AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: false
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
IncludeCategories:
  - Regex:           '^<'
    Priority:        1
  - Regex:           '^"'
    Priority:        2