CODE EXAMPLE FOR SHELL

Automatic merge failed; fix conflicts and then commit the result.

git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false