| commit | 8850c3da95d17bb23576ee5ee3484bfd3d486444 | |
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | |
| Sat, 15 Oct 2011 14:05:19 +0000 (15 15:05 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Oct 2011 03:13:55 +0000 (15 20:13 -0700) | ||
| tree | 5a5f2932d9dad947e379f6ede60cd75b498a26ba | treesnapshot (tar.gz zip) |
| parent | b52612ed4f736c517231954ef0d765add1fe29b7 | commitdiff |
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>
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>
| mergetools/bc3 | diffblobblamehistory |