I'm using 10.0.4 and have been for some time now. Until this week, when I pulled (git) and had conflicts, the webstorm merge dialog would pop, show me the files with conflicts and let me use the diff merge tool to resolve.
Now, for some reason, the pull auto merges and does not provide the merge diff tool as an option.
I have not upgraded between when it worked and when it stopped working.
I have not changed git configuration between when it worked and when it stopped working, nor have I changed merge strategies.
The change occurred on both my workstations which implies some git configuration is telling WebStorm not to offer the merge tool, but that is just speculation.
Has anyone else experienced this? Am I missing some configuration option?