diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:13:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:13:10 -0700 |
| commit | ea81e10ff4e31820407f4cb1b8ebd87de9e51737 (patch) | |
| tree | cf8b40877e775412070288c0086fb9b70a09e6b3 /t/t4109-apply-multifrag.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | merge-recursive: respect core.autocrlf when writing out the result (diff) | |
| download | tgif-ea81e10ff4e31820407f4cb1b8ebd87de9e51737.tar.xz | |
Merge branch 'js/merge-recursive'
* js/merge-recursive:
merge-recursive: respect core.autocrlf when writing out the result
Add testcase for merging in a CRLF repo
Diffstat (limited to 't/t4109-apply-multifrag.sh')
0 files changed, 0 insertions, 0 deletions