combine-diff: move formatting logic to show_combined_diff()