diff-files -c/--cc: combine only when both ours and theirs exist.