.gitconfig
changeset 973 277ccd286936
parent 944 abefcbeca9a5
child 996 17158fb949a8
--- 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