Merge branch 'hv/submodule-find-ff-merge'

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index be541348c6f8d469428e2fcc7abaf6d25168c08f..61de8a2718df8a7b0b0661d7ba47ade133d66ab8 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -32,7 +32,7 @@ EOF
 
 sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
 
-builtin_patterns="bibtex html java objc pascal php python ruby tex"
+builtin_patterns="bibtex cpp csharp html java objc pascal php python ruby tex"
 for p in $builtin_patterns
 do
        test_expect_success "builtin $p pattern compiles" '