tree-diff: rework diff_tree() to generate diffs for multiparent cases as well