diff options
Diffstat (limited to 'etc/meld.profile')
-rw-r--r-- | etc/meld.profile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/etc/meld.profile b/etc/meld.profile index 34b1f22de..321b92cd5 100644 --- a/etc/meld.profile +++ b/etc/meld.profile | |||
@@ -6,6 +6,13 @@ 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 may some other VCS integrations) you need | ||
10 | # to bypass firejail, you can do this by removing the symlink or call it by its absolut path | ||
11 | # Removing the symlink: | ||
12 | # sudo rm /usr/local/bin/meld | ||
13 | # Calling by its absolut path (example for git-mergetoll): | ||
14 | # git config --global mergetool.meld.cmd /usr/bin/meld | ||
15 | |||
9 | noblacklist ${HOME}/.config/git | 16 | noblacklist ${HOME}/.config/git |
10 | noblacklist ${HOME}/.gitconfig | 17 | noblacklist ${HOME}/.gitconfig |
11 | noblacklist ${HOME}/.git-credentials | 18 | noblacklist ${HOME}/.git-credentials |
@@ -26,7 +33,8 @@ include disable-passwdmgr.inc | |||
26 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-programs.inc. | 33 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-programs.inc. |
27 | #include disable-programs.inc | 34 | #include disable-programs.inc |
28 | 35 | ||
29 | include whitelist-var-common.inc | 36 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in /var. |
37 | #include whitelist-var-common.inc | ||
30 | 38 | ||
31 | apparmor | 39 | apparmor |
32 | caps.drop all | 40 | caps.drop all |