mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
2a9f868996
commit
7e4bf67e6a
|
@ -16,5 +16,12 @@ merge_cmd () {
|
||||||
}
|
}
|
||||||
|
|
||||||
translate_merge_tool_path() {
|
translate_merge_tool_path() {
|
||||||
echo bcompare
|
case $(uname -s) in
|
||||||
|
*MINGW*)
|
||||||
|
echo bcomp
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo bcompare
|
||||||
|
;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue