Mercurial > hg
view .editorconfig @ 34946:5caae380ff90 stable
filemerge: pass a default value to _toolstr (issue5718)
After a refactoring, _toolstr stopped having default="" as one of it's args,
therefore when called without a default it returns None and not "". This causes
concatenation to fail.
author | Kostia Balytskyi <ikostia@fb.com> |
---|---|
date | Thu, 26 Oct 2017 11:07:06 -0700 |
parents | d30fdd6d1bf7 |
children | 1d6066336d7b |
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