Revert "update-common: always use a subtree option for merging"
The simpler code only works if the target directory already exists in the target location. Instead, go back to the old merge/read-tree dance which always works for initializing the directory. This reverts commit 020ca677.
Showing with 5 additions and 2 deletions