From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Git <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
msysGit <msysgit@googlegroups.com>,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: [PATCH 6/7] mergetools: use the correct tool for Beyond Compare 3 on Windows
Date: Sat, 15 Oct 2011 15:05:19 +0100 [thread overview]
Message-ID: <1318687520-19522-7-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1318687520-19522-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 <werner@beroux.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
mergetools/bc3 | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/mergetools/bc3 b/mergetools/bc3
index 27b3dd4..b6319d2 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
}
--
1.7.7.1.gbba15
next prev parent reply other threads:[~2011-10-15 14:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-15 14:05 [PATCH 0/7] Some patches from msysGit (round 2) Pat Thoyts
2011-10-15 14:05 ` [PATCH 1/7] t1020: disable the pwd test on MinGW Pat Thoyts
2011-10-15 14:05 ` [PATCH 2/7] t9001: do not fail only due to CR/LF issues Pat Thoyts
2011-10-15 14:05 ` [PATCH 3/7] git-svn: On MSYS, escape and quote SVN_SSH also if set by the user Pat Thoyts
2011-10-15 14:05 ` [PATCH 4/7] t9901: fix line-ending dependency on windows Pat Thoyts
2011-10-15 14:05 ` [PATCH 5/7] t9300: do not run --cat-blob-fd related tests on MinGW Pat Thoyts
2011-10-15 14:05 ` Pat Thoyts [this message]
2011-10-15 14:05 ` [PATCH 7/7] mingw: ensure sockets are initialized before calling gethostname Pat Thoyts
2011-10-16 5:17 ` [PATCH 0/7] Some patches from msysGit (round 2) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318687520-19522-7-git-send-email-patthoyts@users.sourceforge.net \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).