view .editorconfig @ 32313:a580b2d65ded

rebase: make sure merge state is cleaned up for no-op rebases (issue5494)

If a rebase ends up doing a no-op commit, make sure the merge state is still cleaned up.

# 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