From af621691177d42e8c939ba33eb464b0b82c33cd3 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Mon, 8 Apr 2019 18:08:33 +0800
Subject: update

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

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index c9799e7..2b011fc 100644
--- a/gitconfig
+++ b/gitconfig
@@ -13,5 +13,8 @@
 [core]
 	pager = 
 
+[merge]
+    tool = vimdiff
+
 [color]
 	ui = off
-- 
cgit v1.2.3-70-g09d2