From fb4705b4dd6c03c63754e5a6ff52b190e5164e28 Mon Sep 17 00:00:00 2001 From: glitsj16 Date: Wed, 27 Jan 2021 23:35:12 +0000 Subject: streamline 'Allow xxx' comments (#3922) * add comment: allow python * add comment: allow python * reorder allow comments * fix perl allow comment * add comment: allow python * add comment: allow lua, perl & python * reorder allow comments * add comment: allow python * add comment: allow python * add comment: allow lua, perl & python * fix allow comments * add comment: allow python * add comment: allow python * fix spacing in comments * add comment: allow python * add comment: allow python * fix comment * add comment: allow perl & python * add comment: allow lua & python * add comment: allow lua, perl & python * fix allow comments * add comment: allow perl & python * streamline allow python comments --- etc/profile-m-z/meld.profile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'etc/profile-m-z/meld.profile') 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 # Persistent global definitions include globals.local -# If you want to use meld as git-mergetool (and maybe some other VCS integrations) you need +# If you want to use meld as git mergetool (and maybe some other VCS integrations) you need # to bypass firejail, you can do this by removing the symlink or calling it by its absolute path # Removing the symlink: # sudo rm /usr/local/bin/meld -# Calling by its absolute path (example for git-mergetool): +# Calling it by its absolute path (example for git mergetool): # git config --global mergetool.meld.cmd /usr/bin/meld noblacklist ${HOME}/.config/meld @@ -22,10 +22,9 @@ noblacklist ${HOME}/.ssh noblacklist ${HOME}/.subversion # Allow python (blacklisted by disable-interpreters.inc) -include allow-python3.inc - # 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. #include allow-python2.inc +include allow-python3.inc # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. #include disable-common.inc -- cgit v1.2.3-70-g09d2