hektor/nix
1
0 Fork 0
Code Pull Requests Actions Activity

Use 'nvimdiff' as mergetool

Browse Source
This commit is contained in:
hektor committed 2025-01-06 17:15:03 +01:00
1 parent 8886840101
commit 3a7b8738c3
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
.gitconfig
+1 -1
View File
@@ -71,7 +71,7 @@
helper = !/usr/bin/gh auth git-credential
[merge]
tool = vimdiff
tool = nvimdiff
conflictstyle = diff3
[pull]
rebase = true