set GIT_MERGE_AUTOEDIT unconditionally