Lines Matching defs:conflict
1498 bool conflicts_found = 0, conflict;
1515 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;
1516 case DIFF_3RD: if (overlap_only) continue; conflict = 0; break;
1517 case DIFF_ALL: if (simple_only) continue; conflict = flagging; break;
1523 if (conflict)
1528 /* Mark end of conflict. */
1550 /* Mark start of conflict. */
1615 bool conflicts_found = 0, conflict;
1632 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;
1633 case DIFF_3RD: if (overlap_only) continue; conflict = 0; break;
1634 case DIFF_ALL: if (simple_only) continue; conflict = flagging;
1657 if (conflict)
1693 if (conflict)