view .editorconfig @ 48152:8f88307f8e07

dirstate-item: replace another usage of `merged`

We simply spell out the logic here. This was the last usage of `merged`.

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

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

root = true

[*.py]
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
end_of_line = lf

[*.{c,h}]
indent_size = 8
indent_style = tab
trim_trailing_whitespace = true
end_of_line = lf

[*.t]
indent_size = 2
indent_style = space
trim_trailing_whitespace = false
end_of_line = lf