Merge branch 'bc/fortran-userdiff' into next
commitf0c8ddb682771ce685dc3e6b2a6e8113576f03fb
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Sep 2010 16:35:54 +0000 (22 09:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Sep 2010 16:35:54 +0000 (22 09:35 -0700)
treebce40257293d264524a8319b1b2ae9044e8fe734
parentdb674a341c9b098c0203ec64b125c4f657bc289d
parent909a5494f869371565ed9326e984adeabf42611d
Merge branch 'bc/fortran-userdiff' into next

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