mirror of
https://github.com/AquaMorph/dotfiles.git
synced 2025-06-30 17:22:02 +00:00
Git remember merge conflict solve
This commit is contained in:
@ -3,3 +3,5 @@
|
||||
email = christian@cacolglazier.com
|
||||
[core]
|
||||
editor = emacs
|
||||
[rerere]
|
||||
enabled = true
|
||||
|
Reference in New Issue
Block a user