[PATCH v3 0/3] mergetools: vimdiff: regression fix (vimdiff3 mode)

[Fernando Ramos <greenfoo@u92.eu>]

Felipe detected that color highlighting no longer worked when running "git
mergetools -t vimdiff3".

Deeper inspection of the problem revealed that color highlighting was also not
working in other cases (layouts that contained a single window in one of their
tabs)

The current patch series fixes the issue by doing two things:

  1. Making single tab + single window modes (such as "vimdiff3") use the same
     code path as all other layouts.

  2. Fixing the general "single window" case so that color highlighting also
     works there (and this is achieved by adding all buffers to the diff group
     in single window tabs).

In other words, after this patch:

  A) Tabs with more than one window will only highlight differences between the
     buffers shown in those windows.

  B) Tabs with just one window (and this also covers the more specific case of
     layouts with just one tab containing one window) will highlight differences
     between all buffers (LOCAL, BASE, REMOTE, MERGED).


Felipe Contreras (1):
  mergetools: vimdiff: fix comment

Fernando Ramos (2):
  mergetools: vimdiff: fix single tab mode, single window mode and
    colors
  mergetools: vimdiff: update unit tests

 mergetools/vimdiff | 109 +++++++++++++++++++++++++++++----------------
 1 file changed, 70 insertions(+), 39 deletions(-)

-- 
2.37.1