view .editorconfig @ 45288:3f5ac87ae10f

merge: introduce mergeresult.updateactions() and use it

We don't want direct editing and access of mergeresult._actions because soon we
will like to maintain data in other structures also.

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

# 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