From f29ecbbb913ee5b5dcca53d6e155c5ebf21c6bf9 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Fri, 17 Apr 2020 10:47:31 +0200
Subject: Add mergetool to git config

---
 .config/git/config | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.config/git/config')

diff --git a/.config/git/config b/.config/git/config
index 0f811e4..156593a 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -35,6 +35,9 @@
 [difftool]
 	prompt = false
 
+[merge]
+	tool = vimdiff
+
 [pull]
 	default = current
 	#rebase = true
-- 
cgit v1.1