Adding quick option for emacs on git commit msgs
resolving merge