Update gitconfig

This commit is contained in:
2023-05-19 19:59:55 +02:00
parent 832620344f
commit 24952a74fd

View File

@@ -63,3 +63,7 @@
[merge] [merge]
tool = vimdiff tool = vimdiff
conflictstyle = diff3 conflictstyle = diff3
[pull]
rebase = true
[diff]
colorMoved = zebra