aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-02 11:25:36 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-02 11:25:36 -0800
commitf3a70e9cc6d31e3cb8158f64be13c594226bf03f (patch)
tree390d3a46981fb7923c7d1e72666a613e0af39d26 /t
parent5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (diff)
parent909a5494f869371565ed9326e984adeabf42611d (diff)
downloadgit-f3a70e9cc6d31e3cb8158f64be13c594226bf03f.tar.gz
git-f3a70e9cc6d31e3cb8158f64be13c594226bf03f.tar.xz
Merge branch 'bc/fortran-userdiff' into maint
* bc/fortran-userdiff: userdiff.c: add builtin fortran regex patterns
Diffstat (limited to 't')
-rwxr-xr-xt/t4018-diff-funcname.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index c8e19372b..0a61b57b5 100755
--- 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 cpp csharp html java objc pascal php python ruby tex"
+builtin_patterns="bibtex cpp csharp fortran html java objc pascal php python ruby tex"
for p in $builtin_patterns
do
test_expect_success "builtin $p pattern compiles" '