.editorconfig
author Gregory Szorc <gregory.szorc@gmail.com>
Tue, 09 Oct 2018 12:56:11 -0700
changeset 40101 57500950f40e
parent 38281 1d6066336d7b
child 45392 c25efc468a49
permissions -rw-r--r--
cmdutil: sort unresolved paths I noticed that `hg status` was printing unresolved paths in a non-deterministic order. This patch fixes that. I'm not sure if the sorting should be done in merge.mergestate.unresolved() instead. Either way fixes the presentation issue. Differential Revision: https://phab.mercurial-scm.org/D4929

# 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