[PATCH] git-commit-script fix for degenerated merge