Merge tool can't parse conflicted merged files

Hi,

I'm using Git and trying to merge with conflicts. The merge tool in PhpStorm does not seem to understand the conflicted files to merge. See screenshot.

The text that is normally parsed to find the conflicts to solve appears directly in the merge tool:

<<<<<<< Temporary merge branch 1

=======


Am I missing a setting in Git or PhpStorm? BTW this text is not from a prior conflict not resolved and committed. It is definitely generated by a conflict during the merge I'm doing in PhpStorm.

Thanks for any help.



Attachment(s):
Screenshot from 2014-09-11 12:54:03.png

Please sign in to leave a comment.