dotfiles

My personal shell configs and stuff
git clone git://git.alex.balgavy.eu/dotfiles.git
Log | Files | Refs | Submodules | README | LICENSE
commit a29a68bae3d6c247d27012575e262d22442f0f90
parent 019c03a196c99f6a8030f7d1756dd8ce310dbcdb
Author: Alexander Balgavy <alexander.balgavy@spaceapplications.com>
Date:   Sat, 14 Oct 2023 18:50:46 +0200

git: use nvimdiff

Diffstat:

Mgit/gitconfig | 4+++-


1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git/gitconfig b/git/gitconfig
@@ -97,9 +97,11 @@
     df = !git --git-dir=$DOTFILES/.git --work-tree=$DOTFILES
 
 [merge]
-    tool = vimdiff
+    tool = nvimdiff
     conflictstyle = diff3
 
+[mergetool "nvimdiff"]
+    cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
 [core]
     autocrlf = input