combine-diff: refactor built-in xdiff interface.