![[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) |
* js/merge-recursive:
merge-recursive: respect core.autocrlf when writing out the result
Add testcase for merging in a CRLF repo
merge-recursive: respect core.autocrlf when writing out the result
Add testcase for merging in a CRLF repo
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-merge-recursive.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-merge-recursive.c
Simple merge