brethil/dotfiles
1
0
Fork 0
mirror of https://git.decapod.one/brethil/dotfiles synced 2024-12-04 16:51:31 +01:00
Code Issues Releases Wiki Activity

gitconfig: revert back to vimdiff

Browse Source
This commit is contained in:
bretello 2021-03-15 10:29:37 +01:00
parent a19be5a000
commit 74e8f0b33c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitconfig
View File

@ -11,13 +11,13 @@ rebase = true
[merge] [merge]
ff = only ff = only
tool = vimdiff2 tool = vimdiff
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[diff] [diff]
tool = vimdiff2 tool = vimdiff
[difftool] [difftool]
prompt=true prompt=true