λ_git_merge_--no-ff