diff/src/diff3.c

72 struct diff_block {
76   struct diff_block *next;
169 static enum diff_type process_diff_control (char **, struct diff_block *);
175 static struct diff3_block *make_3way_diff (struct diff_block *, struct diff_block *);
177 static struct diff3_block *using_to_diff3_block (struct diff_block *[2], struct diff_block *[2], int, int, struct diff3_block const *);
178 static struct diff_block *process_diff (char const *, char const *, struct diff_block **);
223   struct diff_block *thread0, *thread1, *last_block;
517    diffs (chains of diff_block's).  Assume that each of the two diffs
524 make_3way_diff (struct diff_block *thread0, struct diff_block *thread1)
553   struct diff_block *using[2];
554   struct diff_block *last_using[2];
555   struct diff_block *current[2];
563   struct diff_block *high_water_diff;
564   struct diff_block *other_diff;
687 using_to_diff3_block (struct diff_block *using[2],
688 		      struct diff_block *last_using[2],
694   struct diff_block *ptr;
742       struct diff_block *u = using[d];
923 static struct diff_block *
926 	      struct diff_block **last_block)
933   struct diff_block *block_list, **block_list_end, *bptr;
1069    only the ranges in the diff_block will be set by this routine.
1078 process_diff_control (char **string, struct diff_block *db)