git/mergetools/gvimdiff3, branch gitk-resize-errorFork of git SCM with my patches.http://git.kilabit.info/git/atom?h=gitk-resize-error2020-07-29T21:44:46Zmergetool--lib: improve support for vimdiff-style tool variants2020-07-29T21:44:46Zpudinharogi@skylittlesystem.org2020-07-29T21:31:12Zurn:sha1:83bbf9b92ea8a10a60f44369a200b39ce5db78cd
The merge tools vimdiff2, vimdiff3, gvimdiff2, gvimdiff3 and bc3 are all
variants of the main tools vimdiff and bc. They are implemented in the
main and a one-liner script that just sources it exist for each.
Allow variants ending in [0-9] to be correctly wired without the need
for such one-liners, so instead of 5 scripts, only 1 (gvimdiff) is
needed.
Signed-off-by: pudinha <rogi@skylittlesystem.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools: add vimdiff3 mode2014-04-22T19:49:07ZFelipe Contrerasfelipe.contreras@gmail.com2014-04-21T00:24:20Zurn:sha1:7c147b77d34f072c40b912fafba499727921fa6e
It's similar to the default, except that the other windows are hidden.
This ensures that removed/added colors are still visible on the main
merge window, but the other windows not visible.
Specially useful with merge.conflictstyle=diff3.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>