Searched refs:T_CONFLICT (Results 1 – 7 of 7) sorted by relevance
148 ret = T_CONFLICT;210 ret = T_CONFLICT;255 ret = T_CONFLICT;301 ret = T_CONFLICT;353 ret = T_CONFLICT;
148 case T_CONFLICT:
771 else if (status == T_MODIFIED && xstatus == T_CONFLICT)793 if ((status == T_REMOVE_ENTRY || status == T_CONFLICT)879 case T_CONFLICT:917 if (status == T_CONFLICT && !force_ci)
821 T_CONFLICT, /* C (conflict) list */ enumerator
639 case T_CONFLICT: /* old punt-type errors */667 case T_CONFLICT: /* old punt-type errors */
437 case T_CONFLICT:
620 * commit.c (check_fileproc): T_CONFLICT should be handled like622 T_CONFLICT can now be trusted.626 * status.c (status_fileproc): Trust T_CONFLICT to simplify.628 * update.c (update_fileproc): Trust T_CONFLICT.