Merge branch 'po/clang-format-functype-weight' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Feb 2018 22:55:59 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Feb 2018 22:55:59 +0000 (14:55 -0800)
Prevent "clang-format" from breaking line after function return type.

* po/clang-format-functype-weight:
clang-format: adjust penalty for return type line break

Trivial merge