Merge branch 'gh/userdiff-matlab'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:26:21 +0000 (15:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:26:21 +0000 (15:26 -0800)
commit77230236e38fde817f395efcf66320785cf6f9af
tree426808f8d2f93825d74223d98daf80c71ceb1925
parent9ef569791f967c1559b498d8f77a2c42a14be2ed
parent53b10a140527253f61cfc209a4e85e132c0bc4ee
Merge branch 'gh/userdiff-matlab'

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