nvimdiff mergetool setup
- Id
- cb389d3f6be58e0f082ed8549318e9573bd033ef
- Author
- Caio
- Commit time
- 2024-06-13T10:39:04+02:00
Modified gitconfig
ui = auto
[merge]
- tool = vimdiff
+ tool = nvimdiff
[rebase]
stat = true
[diff]
noprefix = true
+ tool = nvimdiff
[log]
decorate = short
[mergetool]
keepBackup = false
+
+[mergetool "nvimdiff"]
+ layout = "LOCAL,BASE,REMOTE / MERGED"
[init]
defaultBranch = main