Mergetool set to vimdiff

This commit is contained in:
lhark 2016-09-28 10:29:54 -04:00
parent a32570e3c1
commit f7f7a7e1d2

View file

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