diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-08 11:43:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 11:43:16 -0700 |
| commit | 09977c5f501bc0438dfaa99690491c849895f476 (patch) | |
| tree | 1f835b1b8df4c03ea0c7344b5ddab7058744d675 /commit.c | |
| parent | 91ca5f1b1da4c3b29d89b246ffb8e95d03204092 (diff) | |
| parent | 93bab2d04be7ac304a5dd899daccd3e357126f79 (diff) | |
Merge branch 'fr/vimdiff-layout-fixes'
Layout configuration in vimdiff backend didn't work as advertised,
which has been corrected.
* fr/vimdiff-layout-fixes:
mergetools: vimdiff: add tests for layout with REMOTE as the target
mergetools: vimdiff: fix layout where REMOTE is the target
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions