Searched defs:output_diff3_merge (Results 1 – 2 of 2) sorted by relevance
1713 output_diff3_merge (infile, diff, mapping, rev_mapping, in output_diff3_merge() function
1607 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, in output_diff3_merge() function