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

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 77976f902c823dc81a5eccc028b4c1a2b61ccef3..e53b153d4cbcb447eee5952d9ae1aae352b2abb5 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -98,6 +98,7 @@
 
 [rerere]
        enabled = yes
 
 [rerere]
        enabled = yes

+       autoupdate = yes

 
 [stgit]
        autoresolved = yes
 
 [stgit]
        autoresolved = yes