| 7740 | } |
| 7741 | |
| 7742 | struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path) |
| 7743 | { |
| 7744 | struct diff_filepair *pair; |
| 7745 | struct diff_filespec *one, *two; |
| 7746 | |
| 7747 | if (options->prefix && |
| 7748 | strncmp(path, options->prefix, options->prefix_length)) |
| 7749 | return NULL; |
| 7750 | |
| 7751 | one = alloc_filespec(path); |
| 7752 | two = alloc_filespec(path); |
| 7753 | pair = diff_queue(&diff_queued_diff, one, two); |
| 7754 | pair->is_unmerged = 1; |
| 7755 | return pair; |
| 7756 | } |
| 7757 | |
| 7758 | static char *run_textconv(struct repository *r, |
| 7759 | const char *pgm, |
no test coverage detected