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
Junio C Hamano committed
Jun 9, 2008 at 16:13 UTC
ea81e10ff4e31820407f4cb1b8ebd87de9e51737
No changes.