Merge branch 'js/regexec-buf' into maint

diff --git a/.gitattributes b/.gitattributes
index 5e98806c6cc246acef5f539ae191710a0c06ad3f..320e33c327c6f597bcfd255b13876f21b0b2d8aa 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 * whitespace=!indent,trail,space
-*.[ch] whitespace=indent,trail,space
+*.[ch] whitespace=indent,trail,space diff=cpp
 *.sh whitespace=indent,trail,space