Merge tool missing


I'm just doing a merge with IU-111.167 and I can't seem to find the merge tool.

Where's it gone?

Idea knows the file needs to be merged because the Tab text is red. Usually at this stage I right click on the file, select git menu option and click on merge tool.

Merge tool isn't an option any more though.

If I do Ctrl-Shift-A to get my actions and type in merge I see no mention of the merge tool.

Where has it gone?

Thanks, Nick.

Please sign in to leave a comment.