Pass --no-edit to git merge