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

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

bc

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

codecompare

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

deltawalker

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

diffmerge

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

diffuse

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

ecmerge

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

emerge

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

examdiff

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

guiffy

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

gvimdiff

…

kdiff3

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

kompare

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

meld

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

nvimdiff

…

opendiff

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

p4merge

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

smerge

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

tkdiff

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

tortoisemerge

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

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

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00

xxdiff

mergetools: add description to all diff/merge tools

2022-04-03 15:10:04 -07:00