[PATCH 6/7] mergetools: use the correct tool for Beyond Compare 3 on Windows

From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Oct 15, 2011, 14:05 UTC
Message-ID: <1318687520-19522-7-git-send-email-patthoyts@users.sourceforge.net>
In-Reply-To: <1318687520-19522-1-git-send-email-patthoyts@users.sourceforge.net>

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>
---
 mergetools/bc3 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

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

-- 
1.7.7.1.gbba15