Add "skip_unmerged" option to unpack_trees.