Git internal error in diff-resolve-rename-copy

When trying to Compare, or Annonate, I receive this error:

fatal: internal error in diff-resolve-rename-copy

Everything else under the Git menu works.

Software:
phpStorm EAP PS-98.145
msysGit 1.7.1
Windows 7