From: Junio C Hamano Date: Sun, 24 Aug 2008 21:32:18 +0000 (-0700) Subject: Merge branch 'ag/maint-combine-diff-fix' into maint X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=fb7092807962af168a76f6d8cbab02150daa0b5a;p=rit Merge branch 'ag/maint-combine-diff-fix' into maint * ag/maint-combine-diff-fix: Respect core.autocrlf in combined diff --- fb7092807962af168a76f6d8cbab02150daa0b5a