Merge branch 'dt/merge-recursive-case-insensitive' into maint

diff --git a/t/t4018/cpp-struct-single-line b/t/t4018/cpp-struct-single-line
index ad6fa8bbe9457e60bf239902800f0aacf801b3b0..a0de5fb800fec1455deadd9aa2b5ad964a65ecd4 100644 (file)
--- a/t/t4018/cpp-struct-single-line
+++ b/t/t4018/cpp-struct-single-line
@@ -5,4 +5,3 @@ void wrong()
 struct RIGHT_iterator_tag {};
 
 int ChangeMe;
-// broken