Git: Remember merge conflict resolutions
1 file changed, 2 insertions(+), 0 deletions(-)
jump to
M tag-git/config/git/config → tag-git/config/git/config
@@ -30,3 +30,5 @@ [core] excludesfile = ~/.config/git/ignore [rebase] autosquash = true +[rerere] + enabled = true