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)
commitfb7092807962af168a76f6d8cbab02150daa0b5a
tree07c57aa35c65acfc9b40e2abca17d4103699fe92
parent97e5f4908dd22c99e825ccb254f05a61fda8d19c
parent5e568f9e3027797842807213ce590140c9daf9ce
Merge branch 'ag/maint-combine-diff-fix' into maint

* ag/maint-combine-diff-fix:
  Respect core.autocrlf in combined diff