From 2eba8693876715b163980c4b060f742b252a67f5 Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <stefan@imhoff.name>
Date: Mon, 13 Dec 2021 21:13:48 +0100
Subject: [PATCH] chore(git): add NeoVim as mergetool option

---
 gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gitconfig b/gitconfig
index 21f884f..d23d3d5 100644
--- a/gitconfig
+++ b/gitconfig
@@ -74,6 +74,8 @@
 [mergetool "Kaleidoscope"]
   cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
   trustexitcode = true
+[mergetool "nvim"]
+  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [mergetool "code"]
   cmd = "code $MERGED"
   keepBackup = false