merge: back out changeset a4ca0610c754 (parents order when grafting a merge) Turns out it's not enough to just swap parents, because when we do, there are unexpected bad side effects, such as a tracked file becoming untracked. These side effects need more code to be handled properly, but it's not written yet. Let's back this feature out from stable for now and some day implement it on default instead.

     1

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

     2

     3

root = true

     4

     5

[*.py]

     6

indent_size = 4

     7

indent_style = space

     8

trim_trailing_whitespace = true

     9

    10

[*.{c,h}]

    11

indent_size = 8

    12

indent_style = tab

    13

trim_trailing_whitespace = true

    14

    15

[*.t]

    16

indent_size = 2

    17

indent_style = space

    18

trim_trailing_whitespace = false