diff options
Diffstat (limited to 'etc/meld.profile')
-rw-r--r-- | etc/meld.profile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/meld.profile b/etc/meld.profile index 321b92cd5..4a9f64421 100644 --- a/etc/meld.profile +++ b/etc/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 may 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 call it by its absolut 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 absolut path (example for git-mergetoll): | 13 | # Calling 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/git | 16 | noblacklist ${HOME}/.config/git |