Searched refs:DIFF_2ND (Results 1 – 2 of 2) sorted by relevance
80 DIFF_2ND, /* Only the second */ enumerator921 D3_TYPE (result) = DIFF_2ND;1463 case DIFF_2ND:1611 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;1650 if (type == DIFF_2ND)1739 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;
73 DIFF_2ND, /* Only the second */ enumerator849 D3_TYPE (result) = DIFF_2ND; in using_to_diff3_block()1418 case DIFF_2ND: in output_diff3()1563 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; in output_diff3_edscript()1603 if (type == DIFF_2ND) in output_diff3_edscript()1681 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; in output_diff3_merge()