Merge branch 'bc/fortran-userdiff' into maint
commitf3a70e9cc6d31e3cb8158f64be13c594226bf03f
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:25:36 +0000 (2 11:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 19:25:36 +0000 (2 11:25 -0800)
tree390d3a46981fb7923c7d1e72666a613e0af39d26
parent5501bf854ce6a3847ef0de6f6aa63f6b93e82b67
parent909a5494f869371565ed9326e984adeabf42611d
Merge branch 'bc/fortran-userdiff' into maint

* bc/fortran-userdiff:
  userdiff.c: add builtin fortran regex patterns
t/t4018-diff-funcname.sh