three-way diff highlighting is confusing

[SadSock]

The current three-way merge diff highlighting (base, ours, theirs) is visually confusing. ​​All differences are highlighted across all panes​​, making it difficult to focus on relevant changes.

Has a method to restrict ​​ours/theirs​​ panes to show diffs ​​only against base​​, not against each other.

[jakubbortlik]

This would certainly be very nice, but as far as I know, this is not possible with the builtin diff-mode which is tab-based -- all the windows in a tab with diff enabled are part of the diff.

You can work around this by temporarily turning diff mode for one of the buffers with :diffoff (vim-unimpaired maps yod to "toggling" :diffoff and :diffthis).