Lines Matching refs:other_diff
561 struct diff_block *other_diff; in make_3way_diff() local
607 other_diff = current[other_thread]; in make_3way_diff()
611 while (other_diff in make_3way_diff()
612 && D_LOWLINE (other_diff, FC) <= high_water_mark + 1) in make_3way_diff()
618 last_using[other_thread]->next = other_diff; in make_3way_diff()
620 using[other_thread] = other_diff; in make_3way_diff()
621 last_using[other_thread] = other_diff; in make_3way_diff()
627 other_diff->next = 0; in make_3way_diff()
635 if (high_water_mark < D_HIGHLINE (other_diff, FC)) in make_3way_diff()
638 high_water_diff = other_diff; in make_3way_diff()
639 high_water_mark = D_HIGHLINE (other_diff, FC); in make_3way_diff()
644 other_diff = current[other_thread]; in make_3way_diff()