]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ag/maint-combine-diff-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700)
* ag/maint-combine-diff-fix:
  Respect core.autocrlf in combined diff


Trivial merge