![[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) |
* ag/maint-combine-diff-fix:
Respect core.autocrlf in combined diff
Respect core.autocrlf in combined diff
Trivial merge