merge-recursive: respect core.autocrlf when writing out the result