From 34dbf0e3212c670fa05e26c28f322394beb17589 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Wed, 23 Aug 2023 07:50:58 +0000
Subject: [PATCH] git mergetool nvim

---
 git/.gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 3c39c00..01dcae8 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -37,3 +37,9 @@
     po = push origin
 [core]
 	autocrlf = false
+
+[merge]
+    tool = "nvim"
+
+[mergetool "nvim"]
+	cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"