From d6fca68b54249d7f05242ac3dcad1c3f4ea11a4d Mon Sep 17 00:00:00 2001
From: Christian Colglazier <christian@cacolglazier.com>
Date: Sat, 17 Feb 2024 20:14:31 -0500
Subject: [PATCH] Git remember merge conflict solve

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 00e2169..452a3f0 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 	email = christian@cacolglazier.com
 [core]
 	editor = emacs
+[rerere]
+	enabled = true