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