merge: introduce mergeresult.addfile() and use it We want to use mergeresult object at more and more places instead of this actions dict to simplify code and further add new APIs to mergeresult object. This patch introduces `addfile()` which adds a new file to the internal actions dict for now. Differential Revision: https://phab.mercurial-scm.org/D8820

     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