Pat Thoyts 7e4bf67e6a 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>		2011-10-13 12:54:35 +01:00
..
araxis	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
bc3	mergetools: use the correct tool for Beyond Compare 3 on Windows	2011-10-13 12:54:35 +01:00
defaults	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
diffuse	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
ecmerge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
emerge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
kdiff3	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
kompare	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
meld	mergetools/meld: Use '--output' when available	2011-08-19 10:52:16 -07:00
opendiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
p4merge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
tkdiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
tortoisemerge	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
vim	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00
xxdiff	mergetool--lib: Refactor tools into separate files	2011-08-19 00:09:19 -07:00