Last active
February 24, 2022 21:41
-
-
Save CarolHsu/50f67c078b30e33717deb5aea46344a0 to your computer and use it in GitHub Desktop.
Neovim as git diff and merge tool
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [diff] | |
| tool = nvimdiff | |
| [difftool] | |
| prompt = true | |
| [difftool "nvimdiff"] | |
| cmd = nvim -d $LOCAL $REMOTE | |
| [merge] | |
| tool = nvimdiff | |
| [mergetool] | |
| keepBackup = false | |
| [mergetool "nvimdiff"] | |
| cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment