Junio C Hamano 4aff18a3f0 Merge branch 'ls/mergetool-meld-auto-merge' ... The 'meld' backend of the "git mergetool" learned to give the underlying 'meld' the '--auto-merge' option, which would help reduce the amount of text that requires manual merging. * ls/mergetool-meld-auto-merge: mergetool: allow auto-merge for meld to follow the vim-diff behavior		2020-09-22 12:36:29 -07:00
..
araxis	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
bc	mergetool--lib: improve support for vimdiff-style tool variants	2020-07-29 14:44:46 -07:00
codecompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
deltawalker	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
diffmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
diffuse	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
ecmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
emerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
examdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
guiffy	mergetools: add support for guiffy	2018-04-06 08:11:39 +09:00
gvimdiff	…
kdiff3	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
kompare	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
meld	mergetool: allow auto-merge for meld to follow the vim-diff behavior	2020-09-16 17:11:20 -07:00
nvimdiff	mergetools: add support for nvimdiff (neovim) family	2020-07-29 14:44:49 -07:00
opendiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
p4merge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
smerge	mergetools: add support for smerge (Sublime Merge)	2019-04-04 18:21:25 +09:00
tkdiff	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
tortoisemerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
vimdiff	mergetools: add support for nvimdiff (neovim) family	2020-07-29 14:44:49 -07:00
winmerge	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	2016-11-29 10:54:03 -08:00
xxdiff	Merge branch 'da/mergetool-xxdiff-hotkey'	2016-12-19 14:45:41 -08:00