christian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git mergetool nvim

Browse Source
This commit is contained in:
Christian Nieves
2023-08-23 07:50:58 +00:00
parent 87ac7d3773
commit 34dbf0e321
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git/.gitconfig
View File

@ -37,3 +37,9 @@
po = push origin po = push origin
[core] [core]
autocrlf = false autocrlf = false
[merge]
tool = "nvim"
[mergetool "nvim"]
cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"