Lines Matching refs:diff3_block
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()
519 static struct diff3_block *
562 struct diff3_block *result; in make_3way_diff()
563 struct diff3_block *tmpblock; in make_3way_diff()
564 struct diff3_block **result_end; in make_3way_diff()
566 struct diff3_block const *last_diff3; in make_3way_diff()
568 static struct diff3_block const zero_diff3; in make_3way_diff()
682 static struct diff3_block *
686 struct diff3_block const *last_diff3) in using_to_diff3_block()
689 struct diff3_block *result; in using_to_diff3_block()
836 static struct diff3_block *
841 struct diff3_block *result = xmalloc (sizeof *result); in create_diff3_block()
1339 output_diff3 (FILE *outputfile, struct diff3_block *diff, in output_diff3()
1345 struct diff3_block *ptr; in output_diff3()
1427 dotlines (FILE *outputfile, struct diff3_block *b, int filenum) in dotlines()
1487 output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, in output_diff3_edscript()
1494 struct diff3_block *b; in output_diff3_edscript()
1603 output_diff3_merge (FILE *infile, FILE *outputfile, struct diff3_block *diff, in output_diff3_merge()
1611 struct diff3_block *b; in output_diff3_merge()
1716 static struct diff3_block *
1717 reverse_diff3_blocklist (struct diff3_block *diff) in reverse_diff3_blocklist()
1719 register struct diff3_block *tmp, *next, *prev; in reverse_diff3_blocklist()