CODEWITHSUNDEEP
gitvim
L__
L__

Reputation: 194

The vim command line launched by git mergetool

What is the final command launched by git mergetool when the following is set in the config:

git config --global merge.tool vimdiff

Upvotes: 1

Views: 206

Answers (1)

phd
phd

Reputation: 94696

vim -d $MERGED $LOCAL $BASE $REMOTE -c wincmd J

where arguments are different stages of a merge. See description at https://www.git-scm.com/docs/git-mergetool#git-mergetool--tlttoolgt

See also https://vi.stackexchange.com/questions/3985/git-mergetool-vimdiff-command

Upvotes: 3

Related Questions