public void InitMerge() { SumOfConflicts = documentComparer.ConflictList.Count(); ResolvedConflicts = 0; UnsolvedConflicts = documentComparer.ConflictList .Select(p => p.NewValue.Split(new string[] { "=>" }, StringSplitOptions.None).Last()).ToList(); CurrentKey = UnsolvedConflicts.First(); RefreshContent(documentComparer.ConflictList.First()); }
public void RefreshContent(DocumentDiff diff) { var a = UnsolvedConflicts.ToList(); UnsolvedConflicts = a; OriginalText = string.Join("\n", diff.OldValue.ToArray()); NewText = diff.NewValue; MergedText = string.Empty; IsOriginalChecked = false; IsNewChecked = false; }