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>
Pat Thoyts committed
Oct 15, 2011 at 15:05 UTC
8850c3da95d17bb23576ee5ee3484bfd3d486444
1 file changed
+6
-1
mergetools/bc3
+6
-1
@@ -16,5 +16,10 @@ merge_cmd () {
16
}
17
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
25
}