From 1962505d8ee77e202b321b4e2671c5b9fd7c7cc3 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@rossum.fi>
Date: Fri, 4 Nov 2022 12:49:22 +0200
Subject: [PATCH] Git: enable rerere and diff3 mode

---
 home/.config/git/config | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/home/.config/git/config b/home/.config/git/config
index 80168b1..ff052d5 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -20,10 +20,11 @@
 
 [merge]
 	prompt = false
+  conflictstyle = diff3
 	tool = nvim-merge
 
 [mergetool "nvim-merge"]
-	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 	keepBackup = false
 
 [diff]
@@ -50,3 +51,6 @@
 [credential]
 	helper = cache --timeout=600
 	helper = !pass-git-helper $@
+
+[rerere]
+  enabled = true