Searched refs:output_diff3_merge (Results 1 – 4 of 4) sorted by relevance
/dports/devel/cvs-devel/cvs-1.12.13/diff/ |
H A D | diff3.c | 204 static int output_diff3_merge PARAMS((FILE *, struct diff3_block *, int const[3], int const[3], cha… 487 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping, 1711 output_diff3_merge (infile, diff, mapping, rev_mapping, in output_diff3_merge() function
|
H A D | ChangeLog | 433 output_diff3_merge instead of reopening stdin to avoid problems 616 output_diff3_merge, and output_diff3.
|
/dports/textproc/diffutils/diffutils-3.8/src/ |
H A D | diff3.c | 179 static bool output_diff3_merge (FILE *, FILE *, struct diff3_block *, int const[3], int const[3], c… 444 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, in main() 1657 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, in output_diff3_merge() function
|
/dports/textproc/diffutils/diffutils-3.8/ |
H A D | ChangeLog-2008 | 254 (output_diff3_edscript, output_diff3_merge): Likewise. 3250 (output_diff3_edscript, output_diff3_merge): 3254 (output_diff3_edscript, output_diff3_merge): Use them. 3281 (output_diff3_merge): The input file is file 0, not the common file. 3858 (output_diff3_merge): New function.
|