Home
last modified time | relevance | path

Searched refs:setConflictString (Results 1 – 2 of 2) sorted by relevance

/dports/textproc/libkomparediff2/libkomparediff2-21.12.3/src/
H A Ddifference.h72 void setConflictString(const QString& conflict) in setConflictString() function
H A Dkomparemodellist.cpp1181 diff->sourceLineAt(i)->setConflictString(*linesIt); in blendFile()
1210 diff->sourceLineAt(i)->setConflictString(*linesIt); in blendFile()
1247 diff->sourceLineAt(i)->setConflictString(*linesIt); in blendFile()