Use 'nvimdiff' as mergetool

master
Hektor Misplon 2024-12-31 14:18:38 +01:00
parent 454b80aa4e
commit 4ca7557e98
1 changed files with 1 additions and 1 deletions

View File

@ -71,7 +71,7 @@
helper = !/usr/bin/gh auth git-credential
[merge]
tool = vimdiff
tool = nvimdiff
conflictstyle = diff3
[pull]
rebase = true