![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700) | ||
| commit | ea81e10ff4e31820407f4cb1b8ebd87de9e51737 | |
| tree | cf8b40877e775412070288c0086fb9b70a09e6b3 | tree | snapshot |
| parent | 5bcde3082d5f348ff8b02547126746b9b713c8d5 | commit | diff |
| parent | 249c61a62d82c22df98cb72ec61c120887b944e1 | commit | diff |
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
* js/merge-recursive:
merge-recursive: respect core.autocrlf when writing out the result
Add testcase for merging in a CRLF repo
| builtin-merge-recursive.c | diff1 | | diff2 | | blob | history |