Junio C Hamano 09977c5f50 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

2025-04-08 11:43:16 -07:00

..

araxis

…

bc

…

codecompare

…

deltawalker

…

diffmerge

…

diffuse

…

ecmerge

…

emerge

…

examdiff

…

guiffy

…

gvimdiff

…

kdiff3

…

kompare

…

meld

…

nvimdiff

…

opendiff

…

p4merge

…

smerge

…

tkdiff

…

tortoisemerge

…

vimdiff

Merge branch 'fr/vimdiff-layout-fixes'

2025-04-08 11:43:16 -07:00

vscode

mergetools: vscode: new tool

2024-09-01 20:47:58 -07:00

winmerge

…

xxdiff

…