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.profile7
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile
index a5c74047a..d76522fce 100644
--- a/etc/profile-m-z/meld.profile
+++ b/etc/profile-m-z/meld.profile
@@ -6,11 +6,11 @@ include meld.local
6# Persistent global definitions 6# Persistent global definitions
7include globals.local 7include globals.local
8 8
9# If you want to use meld as git-mergetool (and maybe some other VCS integrations) you need 9# If you want to use meld as git mergetool (and maybe some other VCS integrations) you need
10# to bypass firejail, you can do this by removing the symlink or calling it by its absolute path 10# to bypass firejail, you can do this by removing the symlink or calling it by its absolute path
11# Removing the symlink: 11# Removing the symlink:
12# sudo rm /usr/local/bin/meld 12# sudo rm /usr/local/bin/meld
13# Calling 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
16noblacklist ${HOME}/.config/meld 16noblacklist ${HOME}/.config/meld
@@ -21,10 +21,9 @@ noblacklist ${HOME}/.local/share/meld
21noblacklist ${HOME}/.subversion 21noblacklist ${HOME}/.subversion
22 22
23# Allow python (blacklisted by disable-interpreters.inc) 23# Allow python (blacklisted by disable-interpreters.inc)
24include allow-python3.inc
25
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. 24# 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.
27#include allow-python2.inc 25#include allow-python2.inc
26include allow-python3.inc
28 27
29# Allow ssh (blacklisted by disable-common.inc) 28# Allow ssh (blacklisted by disable-common.inc)
30include allow-ssh.inc 29include allow-ssh.inc