From 46a7f1ee522d28ef114f8569934ce4b5add2bef3 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 27 Oct 2019 22:48:21 +0200
Subject: [PATCH] Fixed vimdiff

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

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