Make 'read-tree' do a few more of the trivial merge cases.