combine-diff: Record diff status a bit more faithfully