lhark/rc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Mergetool set to vimdiff

Browse source
This commit is contained in:
lhark 2016-09-28 10:29:54 -04:00
parent a32570e3c1
commit f7f7a7e1d2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gitconfig
View file

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