From e2eb38516bd65231f76bfbf06bc6fd9980785623 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:20:27 +0300 Subject: [PATCH] Git: remove unneeded configuration for meld diff/mergetools --- home/.config/git/config | 9 --------- 1 file changed, 9 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 00409637..522fca2e 100644 --- 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