1 files changed, 4 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 478387c..4caa80d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -36,12 +36,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]