combine-diff: speed it up, by using multiparent diff tree-walker directly