Actually merge in subhistory after assimilating #tests

So as to actually test that if you merge in many times it will work.

Add optional 3rd argument to rest_of_tree() for new-subproj under
path/to/new-sub/.