Andrew's git / gitweb.git / diff
?
Merge branch 'js/merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700)
committerJunio 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

No differences found