Home	Sort by: relevance | last modified time | path

Full Search in project(s): src xsrc Definition Symbol File Path History   | | Help

    Searched defs:output_diff3_merge (Results 1 - 2 of 2) sorted by relevancy

/src/external/gpl2/diffutils/dist/src/
diff3.c	193 static bool output_diff3_merge (FILE *, FILE *, struct diff3_block *, int const[3], int const[3], char const *, char const *, char const *); 409 = output_diff3_merge (stdin, stdout, diff3, mapping, rev_mapping, 1611 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, 1607 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, function
/src/external/gpl2/xcvs/dist/diff/
diff3.c	206 static int output_diff3_merge PARAMS((FILE *, struct diff3_block *, int const[3], int const[3], char const *, char const *, char const *)); 489 conflicts_found = output_diff3_merge (mfp, diff3, mapping, rev_mapping, 1717 output_diff3_merge (infile, diff, mapping, rev_mapping, 1713 output_diff3_merge (infile, diff, mapping, rev_mapping, function

Completed in 16 milliseconds

Indexes created Wed Mar 04 15:26:31 UTC 2026