Useful mergetool settings.
Move the prompt to my zshrc instead of hiding it in a theme.