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

diff --cc builtin-merge-recursive.c
Simple merge