From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 28 May 2020 13:14:42 +0000 (+0300)
Subject: Let's remember about vimdiff in git
X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=commitdiff_plain;h=8f6bba88ba427bf242030e98ccc14618e65460ef

Let's remember about vimdiff in git
---

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