Home
last modified time | relevance | path

Searched refs:output_diff3_merge (Results 1 – 4 of 4) sorted by relevance

/netbsd-src/external/gpl2/xcvs/dist/diff/
H A Ddiff3.c204 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,
1713 output_diff3_merge (infile, diff, mapping, rev_mapping, in output_diff3_merge() function
H A DChangeLog433 output_diff3_merge instead of reopening stdin to avoid problems
616 output_diff3_merge, and output_diff3.
/netbsd-src/external/gpl2/diffutils/dist/src/
H A Ddiff3.c191 static bool output_diff3_merge (FILE *, FILE *, struct diff3_block *, int const[3], int const[3], c…
407 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, in main()
1607 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, in output_diff3_merge() function
/netbsd-src/external/gpl2/diffutils/dist/
H A DChangeLog2375 (output_diff3_edscript, output_diff3_merge):
2379 (output_diff3_edscript, output_diff3_merge): Use them.
2406 (output_diff3_merge): The input file is file 0, not the common file.
2983 (output_diff3_merge): New function.