aboutsummaryrefslogtreecommitdiffstats
path: root/etc/profile-m-z/meld.profile
diff options
context:
space:
mode:
Diffstat (limited to 'etc/profile-m-z/meld.profile')
-rw-r--r--etc/profile-m-z/meld.profile4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile
index 6ceeb867f..a5c74047a 100644
--- a/etc/profile-m-z/meld.profile
+++ b/etc/profile-m-z/meld.profile
@@ -18,7 +18,6 @@ noblacklist ${HOME}/.config/git
18noblacklist ${HOME}/.gitconfig 18noblacklist ${HOME}/.gitconfig
19noblacklist ${HOME}/.git-credentials 19noblacklist ${HOME}/.git-credentials
20noblacklist ${HOME}/.local/share/meld 20noblacklist ${HOME}/.local/share/meld
21noblacklist ${HOME}/.ssh
22noblacklist ${HOME}/.subversion 21noblacklist ${HOME}/.subversion
23 22
24# Allow python (blacklisted by disable-interpreters.inc) 23# Allow python (blacklisted by disable-interpreters.inc)
@@ -27,6 +26,9 @@ include allow-python3.inc
27# Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions. 26# Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions.
28#include allow-python2.inc 27#include allow-python2.inc
29 28
29# Allow ssh (blacklisted by disable-common.inc)
30include allow-ssh.inc
31
30# Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. 32# Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc.
31#include disable-common.inc 33#include disable-common.inc
32include disable-devel.inc 34include disable-devel.inc