Searched refs:output_diff3_merge (Results 1 – 2 of 2) sorted by relevance
| /openbsd/src/gnu/usr.bin/cvs/diff/ |
| 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
|
| D | ChangeLog | 130 output_diff3_merge instead of reopening stdin to avoid problems
313 output_diff3_merge, and output_diff3.
|