Lines Matching defs:conflict
357 potential conflict is the best we can cleanly do given
362 conflict-and-patch-failed case. */
708 /* Reregister to clear conflict flag. */
1446 (char *)0); /* Clear conflict flag on fresh checkout */
2004 /* For binary files, a merge is always a conflict. Same for
2011 mismatch as a conflict. The working file and the RCS file
2015 A all disagree should this be considered a conflict. But more
2017 to treat any such mismatch as an automatic conflict. -twp */
2225 short conflict = 0;
2253 removal. In case 3 we have a conflict.
2268 modification--must be merged. This is a conflict. */
2281 locally modified, then we have a conflict which we can not
2338 conflict = 1;
2343 if (conflict)
2356 /* Register the conflict with the client. */
2499 have a conflict which we can not resolve. Note that this
2641 need to take place. This is a conflict. We give the user
2784 then presumably it doesn't matter, and indicates no conflict. */