From af4a2d18746a6cd9c9cbcd3006dd735468363c70 Mon Sep 17 00:00:00 2001
From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Sun, 3 Jul 2022 15:28:19 -0400
Subject: [PATCH] Set vimdiff as default git merge tool

---
 home/.gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home/.gitconfig b/home/.gitconfig
index fcd0539..ba90195 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -20,3 +20,8 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool]
+    prompt = false
-- 
2.20.1