Alexander Gavrilov [off-list ref] 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.