Searched refs:diff3_block (Results 1 – 2 of 2) sorted by relevance
| /freebsd/contrib/diff/src/ |
| H A D | diff3.c | 80 struct diff3_block { struct 85 struct diff3_block *next; argument 170 static bool output_diff3_edscript (FILE *, struct diff3_block *, int const[3], int const[3], char c… 171 static bool output_diff3_merge (FILE *, FILE *, struct diff3_block *, int const[3], int const[3], c… 172 static struct diff3_block *create_diff3_block (lin, lin, lin, lin, lin, lin); 173 static struct diff3_block *make_3way_diff (struct diff_block *, struct diff_block *); 174 static struct diff3_block *reverse_diff3_blocklist (struct diff3_block *); 175 static struct diff3_block *using_to_diff3_block (struct diff_block *[2], struct diff_block *[2], in… 179 static void output_diff3 (FILE *, struct diff3_block *, int const[3], int const[3]); 222 struct diff3_block *diff3; in main() [all …]
|
| /freebsd/contrib/diff/ |
| H A D | ChangeLog | 3434 (struct diff3_block): Likewise.
|