combine-diff: extend --cc logic to Octopus.