Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Use gina as merge tool #268

Open
amikai opened this issue Aug 6, 2020 · 1 comment
Open

Use gina as merge tool #268

amikai opened this issue Aug 6, 2020 · 1 comment

Comments

@amikai
Copy link

amikai commented Aug 6, 2020

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
Copy link
Owner

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

No branches or pull requests

2 participants