search

lambdalisue / vim-gina

👣 Asynchronously control git repositories in Neovim/Vim 8
http://www.vim.org/scripts/script.php?script_id=5531
MIT License
687 stars 27 forks source link

Use gina as merge tool #268

Open amikai opened 4 years ago

amikai commented 4 years ago

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
lambdalisue commented 4 years ago

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