mergestate: split up reset() for its two use cases We only have one place that calls `ms.reset()` with any arguments. That place is `mergestate.clean()`. The callers that call the function with no arguments seem to all just want delete the mergestate -- none of them look at the instance after calling `reset()`. Let's separate out the two different use cases to make the code clearer. I'll clean up further soon. Differential Revision: https://phab.mercurial-scm.org/D9033

     1

BasedOnStyle: LLVM

     2

IndentWidth: 8

     3

UseTab: ForIndentation

     4

BreakBeforeBraces: Linux

     5

AllowShortIfStatementsOnASingleLine: false

     6

IndentCaseLabels: false

     7

AllowShortBlocksOnASingleLine: false

     8

AllowShortFunctionsOnASingleLine: false

     9

IncludeCategories:

    10

  - Regex:           '^<'

    11

    Priority:        1

    12

  - Regex:           '^"'

    13

    Priority:        2