public MergedLine(
string text,
int? originalLineIndex,
int? changedLineIndex,
LineStatus status,
IMergeConflict mergeConflict)
: base(text, originalLineIndex, changedLineIndex, status)
{
MergeConflict = mergeConflict;
IsHaveConflict = false;
}
private bool CheckConflict(IMergeConflict mc, IComparer<string> comparer)
{
if (mc.FirstVariantLines.Count != mc.SecondVariantLines.Count)
return false;
for (int i = 0; i < mc.FirstVariantLines.Count; i++)
{
if(comparer.Compare(mc.FirstVariantLines[i], mc.SecondVariantLines[i]) != 0)
return false;
}
return true;
}