Code

git-read-tree: make one-way merge also honor the "update" flag