Searched refs:conflicting_item_it (Results 1 – 1 of 1) sorted by relevance
426 set<Id>::const_iterator conflicting_item_it; in ResolveSimpleConflicts() local427 for (conflicting_item_it = progress.ConflictingItemsBeginConst(); in ResolveSimpleConflicts()428 conflicting_item_it != progress.ConflictingItemsEnd(); in ResolveSimpleConflicts()429 ++conflicting_item_it) { in ResolveSimpleConflicts()430 Id id = *conflicting_item_it; in ResolveSimpleConflicts()