Marius Storm-Olsen schrieb: > An LF only conflict file results in the resolved file being in LF, > the commit is in LF and a warning saying that LF will be replaced > by CRLF, and the working dir ends up with a mix of CRLF and LF files. After reading these 3 lines I've no idea what you are talking about. Can you translate this to English, please? ;-) > Sorry, no patch to actually *fix* the problem. Then you should use test_expect_failure instead of test_expect_success. And maybe also mention it in the commit message. > +test_expect_success 'Check that conflict file is CRLF' ' > + git reset --hard a && > + ! git merge side && test_must_fail git merge side && > + cat file | remove_cr | append_cr >file.temp && > + test_cmp file file.temp > +' -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
