Back to [[git:main-git|git main page]]

Before using mergetool, it must be configured :
<code bash>
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt no  # put yes for interactive control
</code>

Then merge can take place :
<code bash>
git mergetool
</code>


URL references:
  * [[https://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/#fromHistor|vimdiff as mergetool]]
  * [[https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git|mergetool howto]]