From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Sat, 15 Oct 2011 14:05:19 +0000 (+0100)
Subject: mergetools: use the correct tool for Beyond Compare 3 on Windows
X-Git-Tag: v1.7.8-rc0~46^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8850c3da95d17bb23576ee5ee3484bfd3d486444;p=git.git

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>
---

diff --git a/mergetools/bc3 b/mergetools/bc3
index 27b3dd48b..b6319d206 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
 }