From 57aaa79a30c605d0534b4178ac918623f98fe28b Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Sun, 3 Jan 2021 23:50:49 +0100
Subject: [PATCH] git: use nvim as mergetool (and difftool)

---
 files/gitconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/files/gitconfig b/files/gitconfig
index 979e8e3..c137022 100644
--- a/files/gitconfig
+++ b/files/gitconfig
@@ -52,6 +52,15 @@
 [push]
     default = nothing
 
+[merge]
+    tool = vimdiff
+
+[mergetool]
+    prompt = false
+
+[mergetool "vimdiff"]
+    path = nvim
+
 [color]
     ui = auto