guillaume
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: use vimdiff as mergetool

master
Guillaume Dott 2017-07-27 09:51:28 +02:00
parent f43f62dc2d
commit 69c3d6f228
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git/gitconfig.include
View File

@ -20,7 +20,8 @@
[diff] [diff]
tool = vimdiff tool = vimdiff
[merge] [merge]
tool = meld tool = vimdiff
conflictstyle = diff3
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[credential] [credential]