hektor/nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 'nvimdiff' as mergetool

Browse Source
This commit is contained in:
Hektor Misplon
2024-12-31 14:18:38 +01:00
parent 454b80aa4e
commit 4ca7557e98
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitconfig
View File

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