Git remember merge conflict solve

This commit is contained in:
Christian Colglazier 2024-02-17 20:14:31 -05:00
parent c740264352
commit d6fca68b54

View File

@ -3,3 +3,5 @@
email = christian@cacolglazier.com email = christian@cacolglazier.com
[core] [core]
editor = emacs editor = emacs
[rerere]
enabled = true