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

1  2 
t/t4018-diff-funcname.sh

Simple merge