Testing that object diffs collapses subtrees without conflicts