Lines Matching refs:other_diff
581 struct diff_block *other_diff; in make_3way_diff() local
627 other_diff = current[other_thread]; in make_3way_diff()
631 while (other_diff in make_3way_diff()
632 && D_LOWLINE (other_diff, FC) <= high_water_mark + 1) in make_3way_diff()
638 last_using[other_thread]->next = other_diff; in make_3way_diff()
640 using[other_thread] = other_diff; in make_3way_diff()
641 last_using[other_thread] = other_diff; in make_3way_diff()
647 other_diff->next = 0; in make_3way_diff()
655 if (high_water_mark < D_HIGHLINE (other_diff, FC)) in make_3way_diff()
658 high_water_diff = other_diff; in make_3way_diff()
659 high_water_mark = D_HIGHLINE (other_diff, FC); in make_3way_diff()
664 other_diff = current[other_thread]; in make_3way_diff()