From 66bf28c8d4b1a4a43f991234b3649f8d57a3876f Mon Sep 17 00:00:00 2001
From: Michal Idziorek <michal.idziorek@citi.com>
Date: Thu, 4 Nov 2021 13:45:35 +0100
Subject: minor changes in nvim config and git config

---
 git/.gitconfig | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'git')

diff --git a/git/.gitconfig b/git/.gitconfig
index 4d656b1..ff10baa 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,23 +1,21 @@
-# This is Git's per-user configuration file.
 [user]
-# Please adapt and uncomment the following lines:
 	name = Miguel
 	email = m.i@gmx.at
+
 [merge]
     tool = vimdiff
     conflictstyle = diff3
 
-
 [mergetool]
   prompt = true
 
 [mergetool "vimdiff"]
   cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J'
-
-[difftool]
-    prompt = false
-
-[diff]
-    tool = vimdiff
     
+[diff]
+    tool = nvimdiff
+
+[difftool "nvimdiff"]
+    cmd = "/root/nvim.appimage -d $LOCAL $REMOTE"
+    prompt = true
 
-- 
cgit v1.2.3