combine-diff: use built-in xdiff.