From b45f977de9826fd0334f0070528c7a4f55404cf7 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 22 Sep 2019 19:22:34 -0700
Subject: [PATCH] Use vimdiff.

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

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index e300459..9fea2fa 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -58,3 +58,8 @@
 	helper = cache --timeout=36000
 [receive]
 	denyCurrentBranch = updateInstead
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false