t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge