Make 'abort' alias work with git merge too