mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Bert Huijben via GitGitGadget" <>
Cc: Bert Huijben <>, Bert Huijben <>
Subject: [PATCH] mergetool: add win32 path translation for diffmerge
Date: Thu, 29 Apr 2021 11:39:58 +0000	[thread overview]
Message-ID: <> (raw)

From: Bert Huijben <>

Use the infrastructure added for finding winmerge to also
automatically find DiffMerge,

Signed-off-by: Bert Huijben <>
    mergetool: Add win32 path translation for DiffMerge
    Re-use the path translation added for winmerge to automatically find
    SouceGear DiffMerge on Windows.

Fetch-It-Via: git fetch pr-git-1014/rhuijben/fix/diffmerge-path-v1

 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 () {
+translate_merge_tool_path() {
+	mergetool_find_win32_cmd "sgdm.exe" "SourceGear/Common/DiffMerge"

base-commit: b0c09ab8796fb736efa432b8e817334f3e5ee75a

             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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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

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).