mergestate: fix BC breakage introduced because of removal of a merge record In fcd0cff3400a I removed the usage of RECORD_RESOLVED_OTHER. However I also removed the reading support, hence if there is any user who runs into merge conflict with older version of hg, upgrades hg and then tries to read mergestate, they will end up with an MergeRecordUnsupportedError.

     1

# See http://EditorConfig.org for the specification

     2

     3

root = true

     4

     5

[*.py]

     6

indent_size = 4

     7

indent_style = space

     8

trim_trailing_whitespace = true

     9

    10

[*.{c,h}]

    11

indent_size = 8

    12

indent_style = tab

    13

trim_trailing_whitespace = true

    14

    15

[*.t]

    16

indent_size = 2

    17

indent_style = space

    18

trim_trailing_whitespace = false