Configure git mergetool

Why wasn't I using this before?!
Never delete master branch with `git brc`

Even if the feature branch we're on has had master merged into it.