From: Olivier Croquette <ocroquette@free.fr>
To: git@vger.kernel.org
Cc: ocroquette@free.fr
Subject: [PATCH] Copy mergetool "bc3" as "bc4"
Date: Mon, 20 Oct 2014 13:03:37 +0200 [thread overview]
Message-ID: <1413803017-30489-1-git-send-email-ocroquette@free.fr> (raw)
Beyond compare 4 is out since september 2014. The CLI interface doesn't seem to have changed compared to the version 3.
Signed-off-by: Olivier Croquette <ocroquette@free.fr>
---
mergetools/bc4 | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
create mode 100644 mergetools/bc4
diff --git a/mergetools/bc4 b/mergetools/bc4
new file mode 100644
index 0000000..b6319d2
--- /dev/null
+++ b/mergetools/bc4
@@ -0,0 +1,25 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
+ -mergeoutput="$MERGED"
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -mergeoutput="$MERGED"
+ fi
+ check_unchanged
+}
+
+translate_merge_tool_path() {
+ if type bcomp >/dev/null 2>/dev/null
+ then
+ echo bcomp
+ else
+ echo bcompare
+ fi
+}
--
1.7.2.5
next reply other threads:[~2014-10-20 11:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 11:03 Olivier Croquette [this message]
2014-10-20 16:40 ` [PATCH] Copy mergetool "bc3" as "bc4" Junio C Hamano
2014-10-20 17:32 ` Junio C Hamano
2014-10-20 18:23 ` Sebastian Schuberth
2014-10-20 18:40 ` Junio C Hamano
2014-10-21 8:44 ` David Aguilar
2014-10-21 18:27 ` Junio C Hamano
2014-10-20 20:35 ` Olivier Croquette
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=1413803017-30489-1-git-send-email-ocroquette@free.fr \
--to=ocroquette@free.fr \
--cc=git@vger.kernel.org \
/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).