Merge conflicts could happen when two branches are merged, for instance:

++<<<<<<< HEAD
+ QString makeCmd = bc->makeCommand();
++=======
+ param.setEnvironment(bc->environment());
+ QString makeCmd = bc->buildSystem()->commandName();
++>>>>>>> 2.4-BuildSystem

The git plugin nicely shows the conflicts in the diff, but it is not possible to jump to the source file by double clicking as it is possible with conventional differences.

Suggestion:
Also jump to the source code when on a merge-conflict line is double clicked.