templates / branches--on commit t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge (4947cf9)
   1: this is just to ensure the directory exists.