Merge branch 'bc/fortran-userdiff'

* bc/fortran-userdiff:
userdiff.c: add builtin fortran regex patterns

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc t/t4018-diff-funcname.sh
Simple merge