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.profile14
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile
index 06ee572c9..2a8bb3acf 100644
--- a/etc/profile-m-z/meld.profile
+++ b/etc/profile-m-z/meld.profile
@@ -13,12 +13,12 @@ include globals.local
13# Calling it by its absolute path (example for git mergetool): 13# Calling it by its absolute path (example for git mergetool):
14# $ git config --global mergetool.meld.cmd /usr/bin/meld 14# $ git config --global mergetool.meld.cmd /usr/bin/meld
15 15
16nodeny ${HOME}/.config/meld 16noblacklist ${HOME}/.config/meld
17nodeny ${HOME}/.config/git 17noblacklist ${HOME}/.config/git
18nodeny ${HOME}/.gitconfig 18noblacklist ${HOME}/.gitconfig
19nodeny ${HOME}/.git-credentials 19noblacklist ${HOME}/.git-credentials
20nodeny ${HOME}/.local/share/meld 20noblacklist ${HOME}/.local/share/meld
21nodeny ${HOME}/.subversion 21noblacklist ${HOME}/.subversion
22 22
23# Allow python (blacklisted by disable-interpreters.inc) 23# Allow python (blacklisted by disable-interpreters.inc)
24# Python 2 is EOL (see #3164). Add the next line to your meld.local if you understand the risks 24# Python 2 is EOL (see #3164). Add the next line to your meld.local if you understand the risks
@@ -29,7 +29,7 @@ include allow-python3.inc
29# Allow ssh (blacklisted by disable-common.inc) 29# Allow ssh (blacklisted by disable-common.inc)
30include allow-ssh.inc 30include allow-ssh.inc
31 31
32deny /usr/libexec 32blacklist /usr/libexec
33 33
34# Add the next line to your meld.local if you don't need to compare files in disable-common.inc. 34# Add the next line to your meld.local if you don't need to compare files in disable-common.inc.
35#include disable-common.inc 35#include disable-common.inc