Searched refs:output_diff3_edscript (Results 1 – 2 of 2) sorted by relevance
| /plan9/sys/src/ape/cmd/diff/ |
| H A D | diff3.c | 187 static int output_diff3_edscript PARAMS((FILE *, struct diff3_block *, int const[3], int const[3], …
383 = output_diff3_edscript (stdout, diff3, mapping, rev_mapping,
1472 output_diff3_edscript (outputfile, diff, mapping, rev_mapping, in output_diff3_edscript() function
|
| H A D | ChangeLog | 747 (output_diff3_edscript, output_diff3_merge):
751 (output_diff3_edscript, output_diff3_merge): Use them.
1353 (output_diff3_edscript): Return just 0 or 1.
1442 * diff3.c (main): Accept -t options and pass to output_diff3_edscript.
1493 * diff3.c (output_diff3_edscript): Return number of overlaps.
|