andrei-stoica/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvim for git diff

Browse Source
This commit is contained in:
Andrei Stoica
2024-01-31 20:40:40 -05:00
parent 0e56a7626a
commit 7dd5258f9b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitconfig
View File

@@ -20,3 +20,9 @@
autocrlf = input autocrlf = input
[init] [init]
defaultBranch = main defaultBranch = main
[merge]
tool = nvim
[mergetool]
keepBackup = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'