public void ResolveConflict(IDiffItemConflicted conflict, ResolveAction resolve)
{
if (this.aFinished)
{
throw new Exception("Cannot do this action on finished conflict resolver");
}
this.aResolveActions[conflict] = resolve;
}
private IEnumerable <IDiffItem> PostprocessItemsFromConflict(IEnumerable <IDiffItem> items, IDiffItemConflicted conflict)
{
foreach (IDiffItem item in items)
{
IDiffItem ret = item;
yield return(ret);
}
}
public void RegisterConflict(IDiffItemConflicted conflict)
{
this.aConflicts.Add(conflict);
}
