From e241d28de0a3f85f5e8f493dc6d41747a97f799f Mon Sep 17 00:00:00 2001
From: Guangxiong Lin <hi@gxlin.org>
Date: Thu, 16 Sep 2021 23:08:33 +0800
Subject: Use vimdiff as merge tool

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index b882e2d..1455c11 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,3 +8,5 @@
 	gpgsign = true
 [gpg]
 	program = gpg
+[merge]
+	tool = vimdiff
-- 
cgit v1.2.3