view .editorconfig @ 42804:7b80ad5af239

merge: hint about using `hg resolve` for resolving conflicts

This was suggested by one of our users at Google. Makes sense to me.

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

# 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

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