change merge-strategy

This commit is contained in:
Jakobus Schürz 2021-05-06 01:37:28 +02:00
parent de9ff26861
commit f5a74e3f03

View file

@ -48,5 +48,3 @@
path = ~/.gitconfig_local
[status]
submodulesummary = 1
[pull]
rebase = true