# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1616282875 -7200
# Node ID 277ccd286936e7d15ba469dfe082bb0d861a22ad
# Parent  27754771cbb65f9d8e3366e7fe53d75c0a1aab4d
Enabled rerere. Keeps database of manually resolved conflicts.

diff -r 27754771cbb6 -r 277ccd286936 .gitconfig
--- a/.gitconfig	Mon Feb 22 20:15:51 2021 +0200
+++ b/.gitconfig	Sun Mar 21 01:27:55 2021 +0200
@@ -59,3 +59,6 @@
 [pull]
 ff = only
 
+[rerere]
+# Reuse Recorded Resolution. Keeps database of manually resolved conflicts.
+enabled = true