Remove git mergetool and difftool, use zsh diffview alias instead

This is because as a git tool, it wants to open each file separately.
Neovim and diffview plugin provide a handy UI to manage multiple files
in diff and merge
This commit is contained in:
Marko Korhonen 2024-01-24 22:48:11 +02:00
parent 5654fd6bee
commit 26bcca97ba
2 changed files with 5 additions and 9 deletions

View file

@ -30,15 +30,6 @@ prompt = false
[mergetool "nvim"]
cmd = nvim +DiffviewOpen
[diff]
tool = nvim
[difftool]
prompt = false
[difftool "nvim"]
cmd = nvim +DiffviewOpen
[pull]
rebase = merges