From 29f6d2e835f44573cee7f3a6b58b177ec6ef5e9a Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandl@softwareparadies.de>
Date: Sun, 24 May 2020 12:57:45 +0200
Subject: [PATCH] Use nvim as diff and merge tool

---
 git/gitconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/git/gitconfig b/git/gitconfig
index 80fb670..abf001b 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -20,8 +20,13 @@
 	whitespace = red reverse            
 [mergetool]
 	keepBackup = false
+	prompt = false
 [diff]
 	tool = vimdiff
+[difftool "vimdiff"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[difftool]
+	prompt = false
 [gitflow]
 	multi-hotfix = true
 [gitflow "branch"]
@@ -39,6 +44,8 @@
 [format]
 	pretty = format:%C(yellow)%h %Cblue%>(12)%ad %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
 
+[mergetool "nvim"]
+	cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [rerere]
 	enabled = true
 [fetch]