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)
* bc/fortran-userdiff:
  userdiff.c: add builtin fortran regex patterns

1  2 
Documentation/gitattributes.txt
t/t4018-diff-funcname.sh

Simple merge
Simple merge