![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700) | ||
| commit | fb7092807962af168a76f6d8cbab02150daa0b5a | |
| tree | 07c57aa35c65acfc9b40e2abca17d4103699fe92 | tree | snapshot |
| parent | 97e5f4908dd22c99e825ccb254f05a61fda8d19c | commit | diff |
| parent | 5e568f9e3027797842807213ce590140c9daf9ce | commit | diff |
Merge branch 'ag/maint-combine-diff-fix' into maint
* ag/maint-combine-diff-fix:
Respect core.autocrlf in combined diff
* ag/maint-combine-diff-fix:
Respect core.autocrlf in combined diff