From 52582d858b723f2290130653921bb788fb0c0bf5 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jdkaplan@metagram.net>
Date: Thu, 14 Oct 2021 09:51:33 -0700
Subject: [PATCH] git: Set mergetool to nvimdiff

---
 git/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/config b/git/config
index f5713c9..744770a 100644
--- a/git/config
+++ b/git/config
@@ -19,6 +19,7 @@ defaultBranch = main
 [merge]
 conflictStyle = diff3
 ff = only
+tool = nvimdiff
 
 [pull]
 ff = only