From a7bdded5c6b35543420d5376abe855d62953a286 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Sun, 13 Oct 2019 13:42:47 +0200
Subject: [PATCH] [ADD][GIT] Alias m4 to vimdiff 4-window view

Sometimes it is useful to also have the base file accessible when
merging branches. This view still has the local file on the left and the
remote branch on the right, with the base in the middle and the result
at the bottom.

The d1o/d2o/d3o take from the local/base/remote for the current file.
---
 git/.gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index f42f207..fa1d1d8 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -69,6 +69,7 @@
     chop = gc --prune=now
     optimize = repack -a -d -f --depth=250 --window=250
     pf = pull --ff-only
+    m4 = mergetool -t vimdiff
 
 [filter "lfs"]
     clean = git-lfs clean -- %f