Lines Matching defs:conflict
1598 int conflicts_found = 0, conflict;
1615 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;
1616 case DIFF_3RD: if (overlap_only) continue; conflict = 0; break;
1617 case DIFF_ALL: if (simple_only) continue; conflict = flagging; break;
1620 if (conflict)
1625 /* Mark end of conflict. */
1648 /* Mark start of conflict. */
1724 int conflicts_found = 0, conflict;
1743 case DIFF_2ND: if (!show_2nd) continue; conflict = 1; break;
1744 case DIFF_3RD: if (overlap_only) continue; conflict = 0; break;
1745 case DIFF_ALL: if (simple_only) continue; conflict = flagging;
1768 if (conflict)
1804 if (conflict)