Searched refs:T_CONFLICT (Results 1 – 6 of 6) sorted by relevance
103 ret = T_CONFLICT; in Classify_File()166 ret = T_CONFLICT; in Classify_File()212 ret = T_CONFLICT; in Classify_File()248 ret = T_CONFLICT; in Classify_File()304 ret = T_CONFLICT; in Classify_File()
142 case T_CONFLICT: in status_fileproc()
798 else if (status == T_MODIFIED && xstatus == T_CONFLICT) in classify_file_internal()820 if ((status == T_REMOVE_ENTRY || status == T_CONFLICT) in classify_file_internal()903 case T_CONFLICT: in check_fileproc()942 if (status == T_CONFLICT && !force_ci) in check_fileproc()
794 T_CONFLICT, /* C (conflict) list */ enumerator
640 case T_CONFLICT: /* old punt-type errors */ in update_fileproc()668 case T_CONFLICT: /* old punt-type errors */ in update_fileproc()
575 case T_CONFLICT: in check_fileproc()