Let's remember about vimdiff in git

diff --git a/git/.gitconfig b/git/.gitconfig
index 7c3b438232aae2d04ffa7bdb45a28570a72b29ab..c5eff0d930a8b7ffa71db3a193e79fc642660991 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -31,5 +31,8 @@
        displayRef = *
 [diff]
        algorithm = patience
+       tool = vimdiff
 [grep]
        lineNumber = true
+[merge]
+       tool = vimdiff