diff options
| author |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-10-15 15:05:19 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:13:55 -0700 |
| commit | 8850c3da95d17bb23576ee5ee3484bfd3d486444 (patch) | |
| tree | 5a5f2932d9dad947e379f6ede60cd75b498a26ba /mergetools/tkdiff | |
| parent | t9300: do not run --cat-blob-fd related tests on MinGW (diff) | |
| download | tgif-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 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions