Last Updated: February 25, 2016
·
1.019K
· raysrashmi

git mergetool -t vimdiff to resolved conflicts in vim mode

git mergetool -t vimdiff

You can use this command to resolve conflicts in vim.

3 Responses
Add your response

Or you can setup it as default (or any else diff tool)

git config --global merge.tool vimdiff
over 1 year ago ·

Nice tip Rashmi. Any idea to use other options instead of vim?

over 1 year ago ·

git mergetool -t
when you hit tab you will find options like meld,gvimdiff and opendiff etc

over 1 year ago ·