undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pat Thoyts 2011-10-15 15:05:19 +01:00 committed by Junio C Hamano
parent b52612ed4f
commit 8850c3da95
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mergetools/bc3
View File

@ -16,5 +16,10 @@ merge_cmd () {
} }
translate_merge_tool_path() { translate_merge_tool_path() {
echo bcompare if type bcomp >/dev/null 2>/dev/null
then
echo bcomp
else
echo bcompare
fi
} }