Fernando Ramos 93bab2d04b mergetools: vimdiff: add tests for layout with REMOTE as the target ...

Add some tests to make sure that now "REMOTE" can be used as a target
(ie. can be used together with the "@" marker) inside
"mergetool.vimdiff.layout"

Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2025-03-25 16:22:41 -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

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

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

mergetools: add support for nvimdiff (neovim) family

2020-07-29 14:44:49 -07:00

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

mergetools: vimdiff: add tests for layout with REMOTE as the target

2025-03-25 16:22:41 -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