From 8f6bba88ba427bf242030e98ccc14618e65460ef Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 28 May 2020 16:14:42 +0300
Subject: [PATCH] Let's remember about vimdiff in git

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

diff --git a/git/.gitconfig b/git/.gitconfig
index 7c3b438..c5eff0d 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -31,5 +31,8 @@
 	displayRef = *
 [diff]
 	algorithm = patience
+	tool = vimdiff
 [grep]
 	lineNumber = true
+[merge]
+	tool = vimdiff
-- 
2.44.0