diff --git a/.clang-format b/.clang-format index 26899f6fa..b0177fcc6 100644 --- a/.clang-format +++ b/.clang-format @@ -8,6 +8,7 @@ AlwaysBreakBeforeMultilineStrings: false AllowShortFunctionsOnASingleLine: false KeepEmptyLinesAtTheStartOfBlocks: true ConstructorInitializerAllOnOneLineOrOnePerLine: true +IncludeBlocks: Merge --- Language: Cpp AllowShortFunctionsOnASingleLine: false