Searched refs:output_diff3_merge (Results 1 – 2 of 2) sorted by relevance
| /freebsd-14.2/contrib/diff/src/ |
| H A D | diff3.c | 171 static bool output_diff3_merge (FILE *, FILE *, struct diff3_block *, int const[3], int const[3], c…
389 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, in main()
1603 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, in output_diff3_merge() function
|
| /freebsd-14.2/contrib/diff/ |
| H A D | ChangeLog | 2844 (output_diff3_edscript, output_diff3_merge):
2848 (output_diff3_edscript, output_diff3_merge): Use them.
2875 (output_diff3_merge): The input file is file 0, not the common file.
3452 (output_diff3_merge): New function.
|