Searched refs:ConflictMarkerKind (Results 1 – 2 of 2) sorted by relevance
44 enum ConflictMarkerKind { enum151 ConflictMarkerKind CurrentConflictMarkerState;
3116 ConflictMarkerKind CMK) { in FindConflictEnd()3154 ConflictMarkerKind Kind = *CurPtr == '<' ? CMK_Normal : CMK_Perforce; in IsStartOfConflictMarker()