Git: remove unneeded configuration for meld diff/mergetools

1 year ago · e2eb38516b
parent 4e59e69155
commit e2eb38516b
1 changed files with 0 additions and 9 deletions
--- a/home/.config/git/config
+++ b/home/.config/git/config
@ -30,21 +30,12 @@
 [mergetool "nvim"]
 	cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'

-[mergetool "meld"]
-  cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE
-
-[diff]
-	tool = meld
-
 [difftool]
 	prompt = false

 [difftool "nvim"]
 	cmd = nvim -d $LOCAL $REMOTE

-[difftool "meld"]
-  cmd = meld --diff $LOCAL $REMOTE
-
 [pull]
 	rebase = merges