filemerge: when using in-memory merge, always put backup files in temp dir Before calling a merge tool, we create a backup of the local side of the merge. That file can be put in the working copy or in a temporary directory, depending on the user's config. When we're merging in memory, we don't want to write to the actual, on-disk working copy, so we write the file to the in-memory working copy instead. However, since we don't support external merge tools with in-memory merge, it makes no difference where the file is actually stored (and if we ever do add support for external merge tools, then the file clearly can't live in the in-memory working-copy object anyway). So, since it doesn't matter where the file is stored, we can simplify by always putting them in the system's temp directory. Differential Revision: https://phab.mercurial-scm.org/D12187

     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

end_of_line = lf

    10

    11

[*.{c,h}]

    12

indent_size = 8

    13

indent_style = tab

    14

trim_trailing_whitespace = true

    15

end_of_line = lf

    16

    17

[*.t]

    18

indent_size = 2

    19

indent_style = space

    20

trim_trailing_whitespace = false

    21

end_of_line = lf