kogakure/dotfiles
1
1
Fork 0
mirror of https://github.com/kogakure/dotfiles.git synced 2026-02-03 20:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(git): add NeoVim as mergetool option

Browse Source
This commit is contained in:
Stefan Imhoff
2021-12-13 21:13:48 +01:00
parent 97afac8d29
commit 2eba869387
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitconfig
View File

@@ -74,6 +74,8 @@
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool "code"]
cmd = "code $MERGED"
keepBackup = false