mirror of
https://github.com/AquaMorph/dotfiles.git
synced 2025-04-29 09:15:34 +00:00
Git remember merge conflict solve
This commit is contained in:
parent
c740264352
commit
d6fca68b54
@ -3,3 +3,5 @@
|
||||
email = christian@cacolglazier.com
|
||||
[core]
|
||||
editor = emacs
|
||||
[rerere]
|
||||
enabled = true
|
||||
|
Loading…
x
Reference in New Issue
Block a user