From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Aug 2022 20:07:04 +0000 (-0700)
Subject: Merge branch 'fc/vimdiff-layout-vimdiff3-fix'
X-Git-Tag: v2.38.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d8074bf8eb7c1f9891cd70b4aeaa48203bfdf20;p=thirdparty%2Fgit.git

Merge branch 'fc/vimdiff-layout-vimdiff3-fix'

"vimdiff3" regression fix.

* fc/vimdiff-layout-vimdiff3-fix:
  mergetools: vimdiff: simplify tabfirst
  mergetools: vimdiff: fix single window layouts
  mergetools: vimdiff: rework tab logic
  mergetools: vimdiff: fix for diffopt
  mergetools: vimdiff: silence annoying messages
  mergetools: vimdiff: make vimdiff3 actually work
  mergetools: vimdiff: fix comment
---

4d8074bf8eb7c1f9891cd70b4aeaa48203bfdf20