development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 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>
This commit is contained in:
Pat Thoyts 2011-10-13 12:54:35 +01:00
parent 2a9f868996
commit 7e4bf67e6a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mergetools/bc3
View file

@ -16,5 +16,12 @@ merge_cmd () {
}
translate_merge_tool_path() {
echo bcompare
case $(uname -s) in
*MINGW*)
echo bcomp
;;
*)
echo bcompare
;;
esac
}