fix alias
suppress prompt for merge message via ENV var, GIT_MERGE_AUTOEDIT