Skip to content

mergetools: vimdiff: regression fix (vimdiff3 mode)

Fernando Ramos git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v3 Latest3 patches 5 repliesIn review

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3mergetools: vimdiff: fix commentmergetools/vimdiff+2 -20 replies
2/3mergetools: vimdiff: fix single tab mode, single window mode and colorsmergetools/vimdiff+49 -205 replies
3/3mergetools: vimdiff: update unit testsmergetools/vimdiff+19 -170 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

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

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(-)
Signature · 1 line
2.37.1