Supply merge.tool option when merging
Use `git mergetool` after error because `-c merge.tool` does not work
Merge branch 'powerline-release-merge' into develop
Force push to my fork of the overlay
Merge branch 'powerline-release-forcepush' into develop