From 61e81fa6953ca890aebb4bde72e36022772ed679 Mon Sep 17 00:00:00 2001
From: Pierre Martin <pierre@occitech.fr>
Date: Wed, 23 Sep 2015 16:17:27 +0200
Subject: [PATCH] Add "rerere" to git config for better merge conflicts
 resolution

---
 templates/gitconfig.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/gitconfig.j2 b/templates/gitconfig.j2
index a2aee98..e276610 100644
--- a/templates/gitconfig.j2
+++ b/templates/gitconfig.j2
@@ -14,4 +14,6 @@
 [core]
     excludesfile = ~/.gitignore
     editor = vim
-    filemode = false
\ No newline at end of file
+    filemode = false
+[rerere]
+    enabled = true
\ No newline at end of file