From b88a199b357dd95be036ad2cc1e42c8c35b2c27e Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@reekynet.com>
Date: Sun, 27 Oct 2019 22:43:52 +0200
Subject: [PATCH] Made neovim work as vimdiff

Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
---
 home/.gitconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/home/.gitconfig b/home/.gitconfig
index 82af7f4..f95799a 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -5,3 +5,10 @@
 [commit]
 	signoff = true
 	gpgsign = true
+[diff]
+    tool = vimdiff
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool "vimdiff"]
+    cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'