After migrating to Windows, I\'m using msysgit with its included bash shell, and that\'s working well for me. But I have issues: our ant build process won\'t run in that sh
The simplest approach would be to set any git (msysGit or Cygwin git) to ignore crlf styles.
core.autocrlf=false
That way, you do not have ant unwanted conflict.