git config merge.tool=vimdiff1

This commit is contained in:
masterzu 2024-11-28 23:36:10 +01:00
parent cb56eb764a
commit cf13273896
Signed by untrusted user who does not match committer: pcao
GPG Key ID: B57DBE40C72FBCF4
1 changed files with 2 additions and 0 deletions

View File

@ -22,3 +22,5 @@
signingkey = A8F721C80E43073F40DF8F21B57DBE40C72FBCF4
[commit]
gpgsign = true
[merge]
tool = vimdiff1