lambdalisue/vim-gina

Use gina as merge tool

Open

#268 aperta il 6 ago 2020

Vedi su GitHub
 (1 commento) (0 reazioni) (0 assegnatari)Vim Script (28 fork)github user discovery
enhancementhelp wanted

Metriche repository

Star
 (688 star)
Metriche merge PR
 (Metriche PR in attesa)

Descrizione

Accroding https://www.grzegorowski.com/using-vim-or-neovim-nvim-as-a-git-mergetool, vim can use vim-fugitive as git mergetool by following git config. How to use gina like this?

# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging
[merge]
  tool = nvim
# automatically launch merge tool without displaying a prompt
[mergetool]
  prompt = false

Guida contributor