Mercurial > hg
view .editorconfig @ 42958:181e52f2b62f stable 5.1.2
merge: back out changeset a4ca0610c754 (parents order when grafting a merge)
Turns out it's not enough to just swap parents, because when we do, there are
unexpected bad side effects, such as a tracked file becoming untracked. These
side effects need more code to be handled properly, but it's not written yet.
Let's back this feature out from stable for now and some day implement it on
default instead.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 20 Sep 2019 23:31:03 +0700 |
parents | 1d6066336d7b |
children | c25efc468a49 |
line wrap: on
line source
# 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