diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:42:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:42:27 -0800 |
| commit | 23838b8a152a6363e22fdbe3f474fab904f701b3 (patch) | |
| tree | 987a3bc21fe943cd3ffba1eb112e4d9c955f233c /userdiff.c | |
| parent | e8f6b51a6bcc904b8a5fed831f718c3f9ed7ef34 (diff) | |
| parent | 8496f568739626c86cb9d82e57fc0b55cb4c0849 (diff) | |
| download | git-23838b8a152a6363e22fdbe3f474fab904f701b3.tar.gz git-23838b8a152a6363e22fdbe3f474fab904f701b3.tar.xz | |
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
* jc/maint-lf-to-crlf-keep-crlf:
lf_to_crlf_filter(): resurrect CRLF->CRLF hack
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions