CE_CONFLICTED 2204 read-cache.c new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED; CE_CONFLICTED 1208 unpack-trees.c if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED) CE_CONFLICTED 1527 unpack-trees.c } else if (!(old->ce_flags & CE_CONFLICTED)) { CE_CONFLICTED 1569 unpack-trees.c if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) CE_CONFLICTED 1789 unpack-trees.c if (current->ce_flags & CE_CONFLICTED) {