From 72303ddc158dc7aa26fe041e9be646bca857babd Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 17 Dec 2015 09:03:36 +0100
Subject: Git: Remember merge conflict resolutions

---
 tag-git/config/git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tag-git/config/git/config b/tag-git/config/git/config
index 2922285..3d6b82a 100644
--- a/tag-git/config/git/config
+++ b/tag-git/config/git/config
@@ -30,3 +30,5 @@
 	excludesfile = ~/.config/git/ignore
 [rebase]
 	autosquash = true
+[rerere]
+	enabled = true
-- 
cgit 1.4.1