Lines Matching defs:conflict

250  *	Called when there is a conflict on a file.
404 "%s.conflict.%s.%x", machnamep, namep, index);
492 /* set the mapping to indicate conflict */
1175 int conflict = 0;
1196 /* done if there was a conflict on the file */
1199 gettext("file conflict"), NULL, 0);
1286 /* conflict if mtime changed */
1290 conflict = 1;
1293 /* conflict if ctime changed */
1297 conflict = 1;
1300 /* if a conflict was detected */
1301 if (conflict) {
1303 gettext("file conflict"), NULL, 0);
1366 int conflict = 0;
1386 /* done if there was a conflict on the file */
1389 gettext("file conflict"), NULL, 0);
1476 /* conflict if mtime changed */
1480 conflict = 1;
1483 /* conflict if ctime changed */
1487 conflict = 1;
1490 /* if a conflict was detected */
1491 if (conflict) {
1493 gettext("file conflict"), NULL, 0);
1725 /* done if there was a conflict on the file */
1728 gettext("file conflict"), NULL, 0);
1835 /* conflict if mtime changed */
1846 /* conflict if ctime changed */
2108 /* done if there was a conflict on the file */
2111 gettext("file conflict"), NULL, 0);
2194 /* conflict if mtime changed */
2205 /* conflict if ctime changed */
2462 /* done if there was a conflict on the file */
2465 gettext("file conflict"), NULL, 0);
2588 /* conflict if mtime changed */
2599 /* conflict if ctime changed */
2677 /* conflict if mtime changed */
2689 /* conflict if ctime changed */
2773 int conflict = 0;
2796 /* done if there was a conflict on the file */
2799 gettext("file conflict"), NULL, 0);
2914 /* conflict if mtime changed */
2918 conflict = 1;
2921 /* conflict if ctime changed */
2925 conflict = 1;
2928 /* if a conflict was detected */
2929 if (conflict) {
2931 gettext("file conflict"), NULL, 0);