view .editorconfig @ 34545:1913162854f2

merge: add pathconflict merge state

Path conflicts that occur during merges are represented by 'pu' (unresolved)
and 'pr' (resolved) records in the merge state.  These are stored on disk
in 'P' records.

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

# 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