From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 23 Feb 2012 10:33:55 +0000 (+0000)
Subject: dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/5ccb9ae3198722e9df95d31ae80f44a31453d716

dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
---

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 77976f9..e53b153 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -98,6 +98,7 @@
 
 [rerere]
 	enabled = yes
+	autoupdate = yes
 
 [stgit]
 	autoresolved = yes