Alexander Gavrilov <angavrilov@xxxxxxxxx> writes: > Steps to reproduce: > > git init > echo foo > file > git add file > git commit -m init > git checkout -b a > git checkout -b b > echo bbb >> file > git add file > git commit -m bbb > git checkout a > echo aaa >> file > git add file > git commit -m aaa > git config core.autocrlf true > git merge b Please add this kind of sequence to test scripts. The patch from a cursory look appears correct. Thanks. -- 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
