unpack-trees: oneway_merge to update submodules