merge-tree: fix where two branches share no changes