From: Pat Thoyts Date: Fri, 14 Oct 2011 22:53:34 GMT Subject: [PATCH 7/8] mergetools: use the correct tool for Beyond Compare 3 on Windows Message-ID: <1318632815-29945-8-git-send-email-patthoyts@users.sourceforge.net> In-Reply-To: <1318632815-29945-1-git-send-email-patthoyts@users.sourceforge.net> 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 Signed-off-by: Pat Thoyts --- mergetools/bc3 | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/mergetools/bc3 b/mergetools/bc3 index 27b3dd4..b642bf2 100644 --- a/mergetools/bc3 +++ b/mergetools/bc3 @@ -16,5 +16,12 @@ merge_cmd () { } translate_merge_tool_path() { - echo bcompare + case $(uname -s) in + *MINGW*) + echo bcomp + ;; + *) + echo bcompare + ;; + esac } -- 1.7.7.1.gbba15