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

home/.config/git/config

@@ -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
 

home/.config/zsh/04-aliases.zsh

@@ -10,6 +10,11 @@ alias gs='git status'
 alias gpull='git pull'
 alias gpush='git push'
 
+# Open nvim with diffview
+# Handy plugin for viewing git diffs
+# and handling merges
+alias diffview='nvim +DiffviewOpen'
+
 # Rename grc alias from forgit since it
 # collides with the grc colorizer
 forgit_revert_commit=fgrc