| test_description='merge conflict in crlf repo |
| test_expect_success setup ' |
| git config core.autocrlf true && |
| echo foo | append_cr >file && |
| git commit -m "Initial" && |
| echo line from a | append_cr >file && |
| git commit -m "add line from a" file && |
| echo line from b | append_cr >file && |
| git commit -m "add line from b" file && |
| 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_expect_success 'Check that conflict file is CRLF' ' |
| test_must_fail git merge side && |
| cat file | remove_cr | append_cr >file.temp && |