Back to git main page

Before using mergetool, it must be configured :

git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt no  # put yes for interactive control

Then merge can take place :

git mergetool

URL references:

• vimdiff as mergetool
• mergetool howto