public OrderedDiffItemFactory <TType, TValue> Conflicted(Action <OrderedDiffItemFactory <TType, TValue> > left, Action <OrderedDiffItemFactory <TType, TValue> > right) { var conflictsLeft = new OrderedDiffItemFactory <TType, TValue>(); left(conflictsLeft); var conflictsRight = new OrderedDiffItemFactory <TType, TValue>(); right(conflictsRight); return(this.Conflicted(conflictsLeft, conflictsRight)); }
public OrderedDiffItemFactory <TType, TValue> Conflicted(OrderedDiffItemFactory <TType, TValue> conflictsLeft, OrderedDiffItemFactory <TType, TValue> conflictsRight) { this.aDiffItems.Add(new DiffAnyConflicted(conflictsLeft.aDiffItems, conflictsRight.aDiffItems)); return(this); }