Searched refs:output_diff3_edscript (Results 1 – 2 of 2) sorted by relevance
| /freebsd/contrib/diff/src/ |
| H A D | diff3.c | 170 static bool output_diff3_edscript (FILE *, struct diff3_block *, int const[3], int const[3], char c…
382 = output_diff3_edscript (stdout, diff3, mapping, rev_mapping, in main()
1487 output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, in output_diff3_edscript() function
|
| /freebsd/contrib/diff/ |
| H A D | ChangeLog | 2844 (output_diff3_edscript, output_diff3_merge):
2848 (output_diff3_edscript, output_diff3_merge): Use them.
3450 (output_diff3_edscript): Return just 0 or 1.
3539 * diff3.c (main): Accept -t options and pass to output_diff3_edscript.
3590 * diff3.c (output_diff3_edscript): Return number of overlaps.
|