diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:44 -0800 |
| commit | 3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355 (patch) | |
| tree | f7fd3cf7157af8a870c2e011b7e8fe8b5ba0691d /merge-recursive.h | |
| parent | 1a7bd4fcfa0c57617828dfc1b6b525af674f6d49 (diff) | |
| parent | 87afe9a5ed759668e35513c44eacd2fd393ba658 (diff) | |
| download | git-3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355.tar.gz | |
Merge branch 'cn/maint-lf-to-crlf-filter' into maint
* cn/maint-lf-to-crlf-filter:
lf_to_crlf_filter(): tell the caller we added "\n" when draining
convert: track state in LF-to-CRLF filter
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions