Lin Sun dbd8c09bfe mergetool: allow auto-merge for meld to follow the vim-diff behavior ...

Make the mergetool used with "meld" backend behave similarly to "vimdiff" by
telling it to auto-merge non-conflicting parts and highlight the conflicting
parts when `mergetool.meld.useAutoMerge` is configured with `true`, or `auto`
for detecting the `--auto-merge` option automatically.

Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Lin Sun <lin.sun@zoom.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2020-09-16 17:11:20 -07:00

..

araxis

…

bc

…

bc3

…

codecompare

…

deltawalker

…

diffmerge

…

diffuse

…

ecmerge

…

emerge

…

examdiff

…

guiffy

…

gvimdiff

…

gvimdiff2

…

gvimdiff3

…

kdiff3

…

kompare

…

meld

mergetool: allow auto-merge for meld to follow the vim-diff behavior

2020-09-16 17:11:20 -07:00

opendiff

…

p4merge

…

smerge

mergetools: add support for smerge (Sublime Merge)

2019-04-04 18:21:25 +09:00

tkdiff

…

tortoisemerge

…

vimdiff

…

vimdiff2

…

vimdiff3

…

winmerge

…

xxdiff

…