.zshrc: export GIT_MERGE_AUTOEDIT=no