From: Junio C Hamano Date: Fri, 26 Aug 2022 18:13:12 +0000 (-0700) Subject: Merge branch 'fc/vimdiff-layout-vimdiff3-fix' into maint X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=222f9537771512ea159c6656a9757a987f7ae0db;p=rit Merge branch 'fc/vimdiff-layout-vimdiff3-fix' into maint "vimdiff3" regression fix. source: <20220810154618.307275-1-felipe.contreras@gmail.com> * 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 --- 222f9537771512ea159c6656a9757a987f7ae0db