Revision 34b383e7cd57692fd3996c1e8c9e738dab53ac48 authored by Junio C Hamano on 13 March 2010, 20:41:20 UTC, committed by Junio C Hamano on 13 March 2010, 20:41:20 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 00fb3d2
t6033-merge-crlf.sh
#!/bin/sh
test_description='merge conflict in crlf repo
b---M
/ /
initial---a
'
. ./test-lib.sh
test_expect_success setup '
git config core.autocrlf true &&
echo foo | append_cr >file &&
git add file &&
git commit -m "Initial" &&
git tag initial &&
git branch side &&
echo line from a | append_cr >file &&
git commit -m "add line from a" file &&
git tag a &&
git checkout side &&
echo line from b | append_cr >file &&
git commit -m "add line from b" file &&
git tag b &&
git checkout master
'
test_expect_success 'Check "ours" is CRLF' '
git reset --hard initial &&
git merge side -s ours &&
cat file | remove_cr | append_cr >file.temp &&
test_cmp file file.temp
'
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 &&
test_cmp file file.temp
'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...