diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:12 -0700 |
| commit | 222f9537771512ea159c6656a9757a987f7ae0db (patch) | |
| tree | f95221390ff6c19e5d8a30e34ff198a2e8f4f85d /diff.c | |
| parent | 10f9eab3473c568264e0f2437d7031c5bb6bb443 (diff) | |
| parent | 34133d9658a079b15af97c7c11d22939719e302d (diff) | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions