From 8850c3da95d17bb23576ee5ee3484bfd3d486444 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Sat, 15 Oct 2011 15:05:19 +0100 Subject: 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 Signed-off-by: Pat Thoyts Signed-off-by: Junio C Hamano --- mergetools/bc3 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mergetools') diff --git a/mergetools/bc3 b/mergetools/bc3 index 27b3dd48b8..b6319d206e 100644 --- a/mergetools/bc3 +++ b/mergetools/bc3 @@ -16,5 +16,10 @@ merge_cmd () { } translate_merge_tool_path() { - echo bcompare + if type bcomp >/dev/null 2>/dev/null + then + echo bcomp + else + echo bcompare + fi } -- cgit v1.2.3