X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=mergetools%2Fbc3;h=b6319d206e2333e42469486604d4635e846e5faa;hb=23838b8a152a6363e22fdbe3f474fab904f701b3;hp=27b3dd48b840139acd65ea742e04221c6400a485;hpb=982d1dce349732539780ee81bb79c8ab26eaed20;p=git.git

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
 }