From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Sep 2010 20:49:23 +0000 (-0700)
Subject: Merge branch 'bc/fortran-userdiff'
X-Git-Tag: v1.7.4-rc0~202
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=083dd39ed4477dc24473986f92e1a1b01f0cfc79;p=git.git

Merge branch 'bc/fortran-userdiff'

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

083dd39ed4477dc24473986f92e1a1b01f0cfc79