Searched refs:ConflictMarkerKind (Results 1 – 2 of 2) sorted by relevance
31 enum ConflictMarkerKind { enum90 ConflictMarkerKind CurrentConflictMarkerState;
2582 ConflictMarkerKind CMK) { in FindConflictEnd()2620 ConflictMarkerKind Kind = *CurPtr == '<' ? CMK_Normal : CMK_Perforce; in IsStartOfConflictMarker()