I am trying to merge a branch into the master. Two files have conflicts. Now I'd like to resolve the conflicts using the merge tool, as shown in the User Guide, but the "Merge Tool" menu entry is greyed out, everywhere in Eclipse. Help me, please?
I never experienced this myself, but other people seem to also have problems sometimes, see the question "Why is the merge tool disabled in Eclipse for a EGit-managed project?" on Stack Overflow (sorry, can't link).