diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-06-09 22:23:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:11:08 -0700 |
| commit | 249c61a62d82c22df98cb72ec61c120887b944e1 (patch) | |
| tree | 69b7ddacb4a89082ad59111085a79024f56d14bf /t | |
| parent | eea982843e34da679689f7c53a4874894a225e9f (diff) | |
| download | git-249c61a62d82c22df98cb72ec61c120887b944e1.tar.gz git-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 't')
| -rwxr-xr-x | t/t6033-merge-crlf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh index ea22837aa..75d9602de 100755 --- a/t/t6033-merge-crlf.sh +++ b/t/t6033-merge-crlf.sh @@ -42,7 +42,7 @@ test_expect_success 'Check "ours" is CRLF' ' test_cmp file file.temp ' -test_expect_failure 'Check that conflict file is CRLF' ' +test_expect_success 'Check that conflict file is CRLF' ' git reset --hard a && test_must_fail git merge side && cat file | remove_cr | append_cr >file.temp && |