From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Sun, 3 Jul 2022 19:28:19 +0000 (-0400)
Subject: Set vimdiff as default git merge tool
X-Git-Url: https://git.xandkar.net/?p=khome.git;a=commitdiff_plain;h=af4a2d18746a6cd9c9cbcd3006dd735468363c70

Set vimdiff as default git merge tool
---

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