Mergetool set to vimdiff
This commit is contained in:
parent
a32570e3c1
commit
f7f7a7e1d2
1 changed files with 3 additions and 0 deletions
|
@ -8,6 +8,9 @@
|
|||
ui = auto
|
||||
[push]
|
||||
default = current
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
[alias]
|
||||
# Basics
|
||||
st = status -s
|
||||
|
|
Loading…
Reference in a new issue