Message ID | c18a5edf505cf8421f4465c9f6e26bce8d94d107.1596727673.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | mergetool-lib: Don't use deprecated variable to detect GNOME | expand |
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