Merge branch 'po/clang-format-functype-weight'

Prevent "clang-format" from breaking line after function return type.

* po/clang-format-functype-weight:
  clang-format: adjust penalty for return type line break
This commit is contained in:
Junio C Hamano 2018-02-13 13:39:14 -08:00
commit 0c13c4f19d

View file

@ -163,7 +163,7 @@ PenaltyBreakComment: 10
PenaltyBreakFirstLessLess: 0
PenaltyBreakString: 10
PenaltyExcessCharacter: 100
PenaltyReturnTypeOnItsOwnLine: 5
PenaltyReturnTypeOnItsOwnLine: 60
# Don't sort #include's
SortIncludes: false