From: "Marco Trevisan (Treviño) via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Marco Trevisan" <mail@3v1n0.net>,
"Marco Trevisan (Treviño)" <mail@3v1n0.net>
Subject: [PATCH v2 2/2] mergetool-lib: give kdiff3 priority in KDE environments
Date: Thu, 06 Aug 2020 15:27:53 +0000 [thread overview]
Message-ID: <c18a5edf505cf8421f4465c9f6e26bce8d94d107.1596727673.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.693.v2.git.1596727673.gitgitgadget@gmail.com>
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Signed-off-by: Marco Trevisan (Treviño) <mail@3v1n0.net>
---
git-mergetool--lib.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index f9d8f309c8..ac6695ea26 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -289,6 +289,9 @@ list_merge_tool_candidates () {
if is_desktop "GNOME" || test -n "$GNOME_DESKTOP_SESSION_ID"
then
tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
+ elif is_desktop "KDE" || test x"$KDE_FULL_SESSION" = x"true"
+ then
+ tools="kdiff3 opendiff tkdiff xxdiff meld $tools"
else
tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
fi
--
gitgitgadget
prev parent reply other threads:[~2020-08-06 17:22 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 13:34 [PATCH 0/3] mergetool-lib: Don't use deprecated variable to detect GNOME Marco Trevisan via GitGitGadget
2020-08-05 13:34 ` [PATCH 1/3] mergetool-lib: use $XDG_CURRENT_DESKTOP to check GNOME Marco Trevisan (Treviño) via GitGitGadget
2020-08-05 20:58 ` Eric Sunshine
2020-08-05 22:14 ` Junio C Hamano
2020-08-06 12:12 ` Marco Trevisan (Treviño)
2020-08-05 13:34 ` [PATCH 2/3] mergetool-lib: keep a list of cross desktop merge tools Marco Trevisan (Treviño) via GitGitGadget
2020-08-05 21:08 ` Eric Sunshine
2020-08-06 8:16 ` Johannes Sixt
2020-08-06 12:19 ` Marco Trevisan (Treviño)
2020-08-06 12:28 ` Marco Trevisan (Treviño)
2020-08-05 13:34 ` [PATCH 3/3] mergetool-lib: give kdiff3 prioirty in KDE environments Marco Trevisan (Treviño) via GitGitGadget
2020-08-05 21:15 ` Eric Sunshine
2020-08-06 12:36 ` Marco Trevisan (Treviño)
2020-08-06 16:17 ` Eric Sunshine
2020-08-06 15:27 ` [PATCH v2 0/2] mergetool-lib: Don't use deprecated variable to detect GNOME Marco Trevisan via GitGitGadget
2020-08-06 15:27 ` [PATCH v2 1/2] mergetool-lib: use $XDG_CURRENT_DESKTOP to check GNOME Marco Trevisan (Treviño) via GitGitGadget
2020-08-06 15:27 ` Marco Trevisan (Treviño) via GitGitGadget [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c18a5edf505cf8421f4465c9f6e26bce8d94d107.1596727673.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=mail@3v1n0.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.