vim-gina icon indicating copy to clipboard operation
vim-gina copied to clipboard

Use gina as merge tool

Open amikai opened this issue 5 years ago • 1 comments

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

amikai avatar Aug 06 '20 10:08 amikai

I've never used git's mergetool itself thus I've no idea. Help wanted.

lambdalisue avatar Aug 06 '20 13:08 lambdalisue