make_3way_diff    176 src/diff3.c    static struct diff3_block *make_3way_diff (struct diff_block *, struct diff_block *);
make_3way_diff    383 src/diff3.c      diff3 = make_3way_diff (thread0, thread1);