dogeystamp/dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git: use nvim for mergetool

Browse Source
This commit is contained in:
dogeystamp 2024-01-02 12:10:22 -05:00
parent 547a46837f
commit b89c75020e
Signed by: dogeystamp
GPG Key ID: 7225FE3592EFFA38
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/.config/git/config
View File

@ -3,3 +3,7 @@
name = dogeystamp name = dogeystamp
[gpg] [gpg]
program = passphrase2pgp program = passphrase2pgp
[merge]
tool = nvimmerge
[mergetool "nvimmerge"]
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""