Pat Thoyts 8850c3da95 mergetools: use the correct tool for Beyond Compare 3 on Windows ...

On Windows the bcompare tool launches a graphical program and does
not wait for it to terminate. A separate 'bcomp' tool is provided which
will wait for the view to exit so we use this instead.

Reported-by: Werner BEROUX <werner@beroux.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-10-15 20:13:55 -07:00

..

araxis

…

bc3

mergetools: use the correct tool for Beyond Compare 3 on Windows

2011-10-15 20:13:55 -07:00

defaults

…

diffuse

…

ecmerge

…

emerge

…

kdiff3

…

kompare

…

meld

…

opendiff

…

p4merge

…

tkdiff

…

tortoisemerge

…

vim

…

xxdiff

…