summaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2008-06-09 22:23:16 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-09 16:11:08 -0700
commit249c61a62d82c22df98cb72ec61c120887b944e1 (patch)
tree69b7ddacb4a89082ad59111085a79024f56d14bf /contrib/examples
parentAdd testcase for merging in a CRLF repo (diff)
downloadtgif-249c61a62d82c22df98cb72ec61c120887b944e1.tar.xz
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>
Diffstat (limited to 'contrib/examples')
0 files changed, 0 insertions, 0 deletions