Searched refs:NIGORI_MERGE (Results 1 – 2 of 2) sorted by relevance
43 NIGORI_MERGE, // Resolved by merging nigori nodes. enumerator
195 ConflictResolver::NIGORI_MERGE, in ApplyNigoriUpdate()