[llvm-branch-commits] [libcxx] b55abcf - [libc++] Fix merge-conflict in .clang-format
Tom Stellard via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Aug 2 21:50:10 PDT 2022
Author: Nikolas Klauser
Date: 2022-08-02T21:48:48-07:00
New Revision: b55abcf777c97ab0fb056191ca6a6efdc9e329ce
URL: https://github.com/llvm/llvm-project/commit/b55abcf777c97ab0fb056191ca6a6efdc9e329ce
DIFF: https://github.com/llvm/llvm-project/commit/b55abcf777c97ab0fb056191ca6a6efdc9e329ce.diff
LOG: [libc++] Fix merge-conflict in .clang-format
(cherry picked from commit d5a3cc1d88d888e38633eb55e2afadb4cf788000)
Added:
Modified:
libcxx/.clang-format
Removed:
################################################################################
diff --git a/libcxx/.clang-format b/libcxx/.clang-format
index 8d8eff5905af..acc6773c16de 100644
--- a/libcxx/.clang-format
+++ b/libcxx/.clang-format
@@ -68,7 +68,7 @@ MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
PackConstructorInitializers: NextLine
-PenaltyIndentedWhitespace: 61
+PenaltyIndentedWhitespace: 2
Language: Cpp
Standard: c++20
More information about the llvm-branch-commits
mailing list