mergetools: use the correct tool for Beyond Compare 3 on Windows

patthoyts · gitster · commit 8850c3da95d1 · 2011-10-15T20:13:55.000-07:00
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 &lt;werner@beroux.com&gt;
Signed-off-by: Pat Thoyts &lt;patthoyts@users.sourceforge.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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
 }

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,10 @@ merge_cmd () {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`translate_merge_tool_path() {`
`19`		`- echo bcompare`
	`19`	`+ if type bcomp >/dev/null 2>/dev/null`
	`20`	`+ then`
	`21`	`+ echo bcomp`
	`22`	`+ else`
	`23`	`+ echo bcompare`
	`24`	`+ fi`
`20`	`25`	`}`