From f7f7a7e1d2d29aeef239c1ea73db5c5d29d2f883 Mon Sep 17 00:00:00 2001
From: lhark <lhark@lharktop>
Date: Wed, 28 Sep 2016 10:29:54 -0400
Subject: [PATCH] Mergetool set to vimdiff

---
 gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitconfig b/gitconfig
index 3eb316a..5ede30b 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,6 +8,9 @@
     ui = auto
 [push]
     default = current
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
 [alias]
     # Basics
     st = status -s