Merge branch 'bc/fortran-userdiff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:23 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:23 +0000 (13:49 -0700)
commit083dd39ed4477dc24473986f92e1a1b01f0cfc79
treecd12d4a3255850bc8d3640eece48a52d9b661121
parent2a1be3f8c41a4eefa8842d01d246ef8111245414
parent909a5494f869371565ed9326e984adeabf42611d
Merge branch 'bc/fortran-userdiff'

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