http://bugs.winehq.org/show_bug.cgi?id=21376
--- Comment #5 from Nikolay Sivov bunglehead@gmail.com 2010-01-15 11:26:42 --- Try:
git revert c2a7535e9d112989abe687255b4f0da9a597678e git revert fc43895f49a423bdc6d826be7ad16b00c960612c
on rebased tree of course, to clean merge conflicts.
After that if Bat fails, try to rebase to c2a7535e9d112989abe687255b4f0da9a597678e and check again.