Add config for aerc

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index cc14fe3b6d2e82c57e20e8f2acfadf4763b296d6..f3cb18daacf448df468df76763858ff8b3ae8b52 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -21,3 +21,10 @@
        defaultBranch = main
 [diff]
   external = difft
+       tool = vimdiff
+[merge]
+  tool = nvim
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'