[PATCH v2 2/2] mergetool-lib: give kdiff3 priority in KDE environments

From

Marco Trevisan (Treviño) via GitGitGadget <gitgitgadget@gmail.com>

Date

Aug 6, 2020, 15:27 UTC

Message-ID

<c18a5edf505cf8421f4465c9f6e26bce8d94d107.1596727673.git.gitgitgadget@gmail.com>

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