git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff