Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.