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 | |
| parent | b52612ed4f736c517231954ef0d765add1fe29b7 (diff) | |
| download | git-8850c3da95d17bb23576ee5ee3484bfd3d486444.tar.gz | |
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')
| -rw-r--r-- | mergetools/bc3 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mergetools/bc3 b/mergetools/bc3 index 27b3dd48b8..b6319d206e 100644 --- a/mergetools/bc3 +++ b/mergetools/bc3 @@ -16,5 +16,10 @@ merge_cmd () { } translate_merge_tool_path() { - echo bcompare + if type bcomp >/dev/null 2>/dev/null + then + echo bcomp + else + echo bcompare + fi } |