From: "Bert Huijben via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Bert Huijben <bert@vmoo.com>, Bert Huijben <bert@vmoo.com>
Subject: [PATCH] mergetool: add win32 path translation for diffmerge
Date: Thu, 29 Apr 2021 11:39:58 +0000 [thread overview]
Message-ID: <pull.1014.git.git.1619696399147.gitgitgadget@gmail.com> (raw)
From: Bert Huijben <bert@vmoo.com>
Use the infrastructure added for finding winmerge to also
automatically find DiffMerge,
Signed-off-by: Bert Huijben <bert@vmoo.com>
---
mergetool: Add win32 path translation for DiffMerge
Re-use the path translation added for winmerge to automatically find
SouceGear DiffMerge on Windows.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1014%2Frhuijben%2Ffix%2Fdiffmerge-path-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1014/rhuijben/fix/diffmerge-path-v1
Pull-Request: https://github.com/git/git/pull/1014
mergetools/diffmerge | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 9b6355b98a71..458ed9a89718 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -16,3 +16,7 @@ merge_cmd () {
exit_code_trustable () {
true
}
+
+translate_merge_tool_path() {
+ mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge"
+}
base-commit: b0c09ab8796fb736efa432b8e817334f3e5ee75a
--
gitgitgadget
next reply other threads:[~2021-04-29 11:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 11:39 Bert Huijben via GitGitGadget [this message]
2021-05-03 5:49 ` [PATCH] mergetool: add win32 path translation for diffmerge 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1014.git.git.1619696399147.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=bert@vmoo.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).