aboutsummaryrefslogtreecommitdiff
path: root/compat/mingw.c
diff options
context:
space:
mode:
authorPat Thoyts <patthoyts@users.sourceforge.net>2011-10-15 15:05:19 +0100
committerJunio C Hamano <gitster@pobox.com>2011-10-15 20:13:55 -0700
commit8850c3da95d17bb23576ee5ee3484bfd3d486444 (patch)
tree5a5f2932d9dad947e379f6ede60cd75b498a26ba /compat/mingw.c
parentb52612ed4f736c517231954ef0d765add1fe29b7 (diff)
downloadgit-8850c3da95d17bb23576ee5ee3484bfd3d486444.tar.gz
git-8850c3da95d17bb23576ee5ee3484bfd3d486444.tar.xz
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>
Diffstat (limited to 'compat/mingw.c')
0 files changed, 0 insertions, 0 deletions