From 011e27ac352b6d0c20c6a8710480a012668747c9 Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@broadbean.com>
Date: Tue, 21 Sep 2021 13:52:20 +0100
Subject: nicer merge/rebase git config

---
 .gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 789e59b..960dbd7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -38,12 +38,16 @@
         mnemonicprefix = true
         renames = copies
         colorMoved = zebra
+[merge]
+        conflictstyle = diff3
 [log]
         decorate = short
         date = iso
 [rebase]
         stat = true
         autosquash = true
+[rerere]
+        enabled = true
 [transfer]
         fsckobjects = true
 [grep]
-- 
cgit v1.2.3