git-rebase--interactive.sh: Make 3-way merge strategies work for -p.