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 <[email protected]> Signed-off-by: Pat Thoyts <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
luceliu · Oct 16, 2011 · 8850c3d · 8850c3d
1 parent b52612e
commit 8850c3d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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
 }