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

git: add more windows in vimdiff

Browse Source
This commit is contained in:
Guillaume Dott 2026-08-20 16:37:56 +02:00
parent 56c33083d0
commit da450a410e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/config
View File

@ -27,6 +27,8 @@
conflictstyle = diff3
[mergetool]
keepBackup = false
[mergetool "vimdiff"]
layout = "LOCAL,BASE,REMOTE / MERGED + LOCAL,REMOTE + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"
[credential]
helper = cache
[help]