From: "Michael Schindler via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Michael Schindler <michael@compressconsult.com>,
Michael Schindler <michael@compressconsult.com>
Subject: [PATCH] Update kdiff3 install location
Date: Fri, 07 Oct 2022 11:17:29 +0000 [thread overview]
Message-ID: <pull.1376.git.1665141449621.gitgitgadget@gmail.com> (raw)
From: Michael Schindler <michael@compressconsult.com>
newer versions of kdiff3 for windows install the executable for windows
in a /bin subfolder.
This change changes the place where the executable is searched to the new
location if not found in %PATH%
fetch a recent windows version from https://download.kde.org/stable/kdiff3/
to see.
Signed-off-by: Michael Schindler <michael.schindler@allianz.at>
---
Update kdiff3
newer versions of kdiff3 for windows install the executable for windows
in a bin subfolder. This change changes the place where the executable
is searched to the new location if not found in %PATH%
fetch a recent windows version from
https://download.kde.org/stable/kdiff3/ to see.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1376%2Fmichaelcompressconsult%2Fkdiff3_win_moved-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1376/michaelcompressconsult/kdiff3_win_moved-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1376
mergetools/kdiff3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index ee8b3a0570e..c26a9573815 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -39,6 +39,6 @@ translate_merge_tool_path() {
then
echo kdiff3
else
- mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
+ mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3/bin"
fi
}
base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164
--
gitgitgadget
next reply other threads:[~2022-10-07 11:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 11:17 Michael Schindler via GitGitGadget [this message]
2022-10-07 17:02 ` [PATCH] Update kdiff3 install location 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.1376.git.1665141449621.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=michael@compressconsult.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).