Skip to content

Instantly share code, notes, and snippets.

Avatar

Rich Churcher richchurcher

  • Auckland, New Zealand
View GitHub Profile
@dteoh
dteoh / .gitconfig
Created March 17, 2019 23:40
Use Neovim as git mergetool
View .gitconfig
[merge]
tool = vimdiff
[mergetool]
keepBackup = false
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'