view .editorconfig @ 30162:5cb830801855

merge: clarify warning for (not) merging flags without ancestor

Give hints why it can't merge and what it will do instead.

# 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