]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
* gh/userdiff-matlab:
  Add built-in diff patterns for MATLAB code


Trivial merge