Merge "clang-format: Adjust short functions / if settings."

This commit is contained in:
Tao Bao
2016-12-13 18:13:55 +00:00
committed by Gerrit Code Review
+2 -1
View File
@@ -1,6 +1,7 @@
BasedOnStyle: Google BasedOnStyle: Google
AllowShortBlocksOnASingleLine: false AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: true
ColumnLimit: 100 ColumnLimit: 100
CommentPragmas: NOLINT:.* CommentPragmas: NOLINT:.*