Lines Matching refs:conflict
1540 bool conflict; in output_diff3_edscript() local
1557 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; in output_diff3_edscript()
1558 case DIFF_3RD: if (overlap_only) continue; conflict = false; break; in output_diff3_edscript()
1559 case DIFF_ALL: if (simple_only) continue; conflict = flagging; break; in output_diff3_edscript()
1565 if (conflict) in output_diff3_edscript()
1658 bool conflict; in output_diff3_merge() local
1675 case DIFF_2ND: if (!show_2nd) continue; conflict = true; break; in output_diff3_merge()
1676 case DIFF_3RD: if (overlap_only) continue; conflict = false; break; in output_diff3_merge()
1677 case DIFF_ALL: if (simple_only) continue; conflict = flagging; in output_diff3_merge()
1700 if (conflict) in output_diff3_merge()
1736 if (conflict) in output_diff3_merge()