view .editorconfig @ 39743:f803bcb902ad

meld: enable auto-merge

This tells meld to resolve trivial conflicts before presenting the
user with the remaining conflicts.

This was attempted 5 years ago, but then --auto-merge was too new that
the patch was rejected out of concern that users still had an older
version of meld installed [1]. Maybe it's safe to assume that they
have a newer version now.


 [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2013-April/050084.html

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

# 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