Lately I'm unable to complete a merge with conflicts. On the bottom right it says 'merging <branch>' after the conflicts are resolved and then nothing happens. The only thing I can do now is go to TortoiseGIT and abort merge.
Tried PHPStorm 7.0 and 7.1.1. but both don't work anymore. Something todo with a git executable / version? Not aware I've updated it.
Thanks in advance