Added GIT_MERGE_AUTOEDIT.