Searched refs:T_CONFLICT (Results 1 – 7 of 7) sorted by relevance
105 ret = T_CONFLICT; in Classify_File()168 ret = T_CONFLICT; in Classify_File()214 ret = T_CONFLICT; in Classify_File()250 ret = T_CONFLICT; in Classify_File()306 ret = T_CONFLICT; in Classify_File()
164 case T_CONFLICT: in status_fileproc()
748 else if (status == T_MODIFIED && xstatus == T_CONFLICT) in classify_file_internal()770 if ((status == T_REMOVE_ENTRY || status == T_CONFLICT) in classify_file_internal()853 case T_CONFLICT: in check_fileproc()892 if (status == T_CONFLICT && !force_ci) in check_fileproc()
821 T_CONFLICT, /* C (conflict) list */ enumerator
668 case T_CONFLICT: /* old punt-type errors */ in update_fileproc()696 case T_CONFLICT: /* old punt-type errors */ in update_fileproc()
626 case T_CONFLICT: in check_fileproc()
114 * commit.c (check_fileproc): T_CONFLICT should be handled like116 T_CONFLICT can now be trusted.119 * status.c (status_fileproc): Trust T_CONFLICT to simplify.122 * update.c (update_fileproc): Trust T_CONFLICT.