![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Mon, 9 Jun 2008 21:23:16 +0000 (22:23 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jun 2008 23:11:08 +0000 (16:11 -0700) | ||
| commit | 249c61a62d82c22df98cb72ec61c120887b944e1 | |
| tree | 69b7ddacb4a89082ad59111085a79024f56d14bf | tree | snapshot |
| parent | eea982843e34da679689f7c53a4874894a225e9f | commit | diff |
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>
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>
| builtin-merge-recursive.c | diff | blob | history | |
| t/t6033-merge-crlf.sh | diff | blob | history |