diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:29 -0800 |
| commit | 339aff0846ccf21905d047c20e3c7d077d6f300b (patch) | |
| tree | 51f1d8361a6607751f86919f331280340492f8ca /builtin/merge.c | |
| parent | e927c1675171a24823c8683fd48768024795c996 (diff) | |
| parent | 8496f568739626c86cb9d82e57fc0b55cb4c0849 (diff) | |
| download | git-339aff0846ccf21905d047c20e3c7d077d6f300b.tar.gz | |
Merge branch 'jc/maint-lf-to-crlf-keep-crlf'
* jc/maint-lf-to-crlf-keep-crlf:
lf_to_crlf_filter(): resurrect CRLF->CRLF hack
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions