view .clang-format @ 45494:9ea4b52ac6bb

mergestate: move most of of reset() into start()

`ms.reset()` has somehow become a combination of two different things:

 1. A constructor-like function creating an empty instance
 2. A call to `shutil.rmtree()` to clear the mergestate.

It seems that all callers now care only about the latter (since we
changed one caller to use the new `ms.start()` method instead). Let's
move the code for the former into `start()`, since that's the only
place it's needed.

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

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