Remove GIT_MERGE_AUTOEDIT environment variable, to serve as a reminder to use git pull --rebase instead :P