view .editorconfig @ 48060:a660d8a53267

dirstate: use a new `drop_merge_data` in `setparent`

What is happening in this `setparent` loop is that we remove all `merge`
related information when the dirstate is moved out of a `merge` situation.

So instead of shuffling state to get them where we want, we simply add a method
on the DirstateItem to do drop the information we want dropped.

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

# See http://EditorConfig.org for the specification

root = true

[*.py]
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
end_of_line = lf

[*.{c,h}]
indent_size = 8
indent_style = tab
trim_trailing_whitespace = true
end_of_line = lf

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