tree 07c57aa35c65acfc9b40e2abca17d4103699fe92
parent 97e5f4908dd22c99e825ccb254f05a61fda8d19c
parent 5e568f9e3027797842807213ce590140c9daf9ce
author Junio C Hamano <gitster@pobox.com> 1219613538 -0700
committer Junio C Hamano <gitster@pobox.com> 1219613538 -0700

Merge branch 'ag/maint-combine-diff-fix' into maint

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