From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2011 23:26:21 +0000 (-0800)
Subject: Merge branch 'gh/userdiff-matlab'
X-Git-Tag: v1.7.9-rc0~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77230236e38fde817f395efcf66320785cf6f9af;p=git.git

Merge branch 'gh/userdiff-matlab'

* gh/userdiff-matlab:
  Add built-in diff patterns for MATLAB code
---

77230236e38fde817f395efcf66320785cf6f9af