merge --no-commit: tweak message