When having merge conflicts with git (and "git config set merge.conflictstyle diff3" set)
the file(s) contain one or multiple sections that show the "your code change" / "original code" / "other code change" . When resolving that conflict it is necessary to find out what changed between "original code" and "other code change", to be able to apply that change to "your code change".

Example, merging "origin/17.0" into the current local state:

<<<<<<< HEAD
    to open the CMakeLists.txt file for the current run configuration
    in the editor. This is the same build target as when you go to
    \uicontrol Build and select \uicontrol {Build for Run Configuration}.
||||||| 4ab3e4289e6
    to open the CMakeLists.txt file for the current run configuration
    in the editor. This is the same build target as when you select
    \uicontrol Build > \uicontrol {Build for Run Configuration}.
=======
    to open the \c CMakeLists.txt file for the current run configuration
    in the editor. This is the same build target as when you select
    \uicontrol Build > \uicontrol {Build for Run Configuration}.
>>>>>>> origin/17.0

The first section (between "<<<<<<< HEAD" and "||||||| 4ab3e4289e6") shows the current local branch.
The last section (between "=======" and ">>>>>>> origin/17.0") shows the state in origin/17.0 branch.
The middle section (between "||||||| 4ab3e4289e6" and "=======") shows the text before it was independently changed in the local branch and origin/17.0.

In this case it would be very useful to see the (word-wise) diff between the middle section and the last section (in this case "\c" was added before "CMakeLists.txt"), so I can apply that change to the first section and commit that.

In other cases the diff between the first section and the middle section could be useful too.