* The result (p->elem) is from the working tree and their * parents are typically from multiple stages during a merge * (i.e. diff-files) or the state in HEAD and in the index * (i.e. diff-index). */
| 1282 | * (i.e. diff-index). |
| 1283 | */ |
| 1284 | void show_combined_diff(struct combine_diff_path *p, |
| 1285 | int num_parent, |
| 1286 | struct rev_info *rev) |
| 1287 | { |
| 1288 | struct diff_options *opt = &rev->diffopt; |
| 1289 | |
| 1290 | if (opt->output_format & (DIFF_FORMAT_RAW | |
| 1291 | DIFF_FORMAT_NAME | |
| 1292 | DIFF_FORMAT_NAME_STATUS)) |
| 1293 | show_raw_diff(p, num_parent, rev); |
| 1294 | else if (opt->output_format & DIFF_FORMAT_PATCH) |
| 1295 | show_patch_diff(p, num_parent, 1, rev); |
| 1296 | } |
| 1297 | |
| 1298 | static void free_combined_pair(struct diff_filepair *pair) |
| 1299 | { |
no test coverage detected