@ -8,6 +8,9 @@
ui = auto
[push]
default = current
[merge]
tool = vimdiff
conflictstyle = diff3
[alias]
# Basics
st = status -s