git config merge.tool=vimdiff1
This commit is contained in:
parent
cb56eb764a
commit
cf13273896
|
@ -22,3 +22,5 @@
|
||||||
signingkey = A8F721C80E43073F40DF8F21B57DBE40C72FBCF4
|
signingkey = A8F721C80E43073F40DF8F21B57DBE40C72FBCF4
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
[merge]
|
||||||
|
tool = vimdiff1
|
||||||
|
|
Loading…
Reference in New Issue