merge: use constants for merge record state
Named constants are easier to read than short string values.
Differential Revision: https://phab.mercurial-scm.org/D2700
# See http://EditorConfig.org for the specification
root = true
[*.py]
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
[*.{c,h}]
indent_size = 8
indent_style = tab
trim_trailing_whitespace = true