| commit | 4d8074bf8eb7c1f9891cd70b4aeaa48203bfdf20 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Aug 2022 20:07:04 +0000 (18 13:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Aug 2022 20:07:04 +0000 (18 13:07 -0700) | ||
| tree | e599bbc5b01adf4e2b617855ce9718d95969a444 | treesnapshot (tar.gz zip) |
| parent | 58ded4a4dca5585f771b905afe70e710a376396f | commitdiff |
| parent | 34133d9658a079b15af97c7c11d22939719e302d | commitdiff |
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
"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