tree 69b7ddacb4a89082ad59111085a79024f56d14bf
parent eea982843e34da679689f7c53a4874894a225e9f
author Johannes Schindelin <Johannes.Schindelin@gmx.de> 1213046596 +0100
committer Junio C Hamano <gitster@pobox.com> 1213053068 -0700

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

The code forgot to convert the blob contents into work tree
representation before writing it out.  Also fixes leaks -- earlier
the updated blobs were never freed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>