From: Junio C Hamano <gitster@pobox.com>
To: "Bert Huijben via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Bert Huijben <bert@vmoo.com>,
David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH] mergetool: add win32 path translation for diffmerge
Date: Mon, 03 May 2021 14:49:51 +0900 [thread overview]
Message-ID: <xmqqbl9s8iyo.fsf@gitster.g> (raw)
In-Reply-To: <pull.1014.git.git.1619696399147.gitgitgadget@gmail.com> (Bert Huijben via GitGitGadget's message of "Thu, 29 Apr 2021 11:39:58 +0000")
"Bert Huijben via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Bert Huijben <bert@vmoo.com>
>
> Use the infrastructure added for finding winmerge to also
> automatically find DiffMerge,
> ...
> 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"
> +}
c5f424fd (mergetools/diffmerge: support DiffMerge as a git
mergetool, 2013-10-13) explains that
mergetools/diffmerge: support DiffMerge as a git mergetool
DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux.
See http://www.sourcegear.com/diffmerge/
DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the
graphical compare tool.
Now, I would assume sgdm.exe would be something users of Windows
version of the tool may be familiar with, but how would the proposed
change affect users of the tool on other platforms?
prev parent reply other threads:[~2021-05-03 5:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 11:39 [PATCH] mergetool: add win32 path translation for diffmerge Bert Huijben via GitGitGadget
2021-05-03 5:49 ` Junio C Hamano [this message]
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=xmqqbl9s8iyo.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=bert@vmoo.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.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.
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).