Lines Matching refs:other_diff
560 struct diff_block *other_diff; in make_3way_diff() local
606 other_diff = current[other_thread]; in make_3way_diff()
610 while (other_diff in make_3way_diff()
611 && D_LOWLINE (other_diff, FC) <= high_water_mark + 1) in make_3way_diff()
617 last_using[other_thread]->next = other_diff; in make_3way_diff()
619 using[other_thread] = other_diff; in make_3way_diff()
620 last_using[other_thread] = other_diff; in make_3way_diff()
626 other_diff->next = 0; in make_3way_diff()
634 if (high_water_mark < D_HIGHLINE (other_diff, FC)) in make_3way_diff()
637 high_water_diff = other_diff; in make_3way_diff()
638 high_water_mark = D_HIGHLINE (other_diff, FC); in make_3way_diff()
643 other_diff = current[other_thread]; in make_3way_diff()