Lines Matching defs:conflicted
230 svn_boolean_t conflicted,
256 if (conflicted)
274 /* not text conflicted */
448 metadata_only, info->conflicted,
593 svn_boolean_t conflicted;
621 NULL, &conflicted, NULL, NULL, NULL, NULL,
843 metadata_only, conflicted, is_move,
1032 if (info->conflicted)
1072 svn_boolean_t conflicted;
1129 &conflicted, NULL, NULL, NULL,
1139 if (conflicted)