diff options
Diffstat (limited to 'etc/profile-m-z/meld.profile')
-rw-r--r-- | etc/profile-m-z/meld.profile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile index 6ceeb867f..1a68cd37d 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 |
7 | include globals.local | 7 | include 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 | ||
16 | noblacklist ${HOME}/.config/meld | 16 | noblacklist ${HOME}/.config/meld |
@@ -22,10 +22,9 @@ noblacklist ${HOME}/.ssh | |||
22 | noblacklist ${HOME}/.subversion | 22 | noblacklist ${HOME}/.subversion |
23 | 23 | ||
24 | # Allow python (blacklisted by disable-interpreters.inc) | 24 | # Allow python (blacklisted by disable-interpreters.inc) |
25 | include allow-python3.inc | ||
26 | |||
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. | 25 | # 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 | 26 | #include allow-python2.inc |
27 | include allow-python3.inc | ||
29 | 28 | ||
30 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. | 29 | # 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 | 30 | #include disable-common.inc |