submodule.c: move submodule merging to merge-recursive.c