.editorconfig
author Charles Chamberlain <cchamberlain@janestreet.com>
Tue, 26 May 2020 11:14:07 -0400
branchstable
changeset 44906 e5043679bfcc
parent 38281 1d6066336d7b
child 45392 c25efc468a49
permissions -rw-r--r--
graft-state: save --base in graft's state, fixing bug with graft --continue Without this change, running graft --continue after grafting a merge commit using --base (and encountering conflicts) will output "skipping ungraftable merge revision" even though we specified a base in the initial graft command. Graft's improve behaviour is reflected in test-graft.t. Differential Revision: https://phab.mercurial-scm.org/D8578

# 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

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