예제 #1
0
        public ValueDiffItemFactory <TType> Conflicted(Action <ValueDiffItemFactory <TType> > left, Action <ValueDiffItemFactory <TType> > right)
        {
            var conflictsLeft = new ValueDiffItemFactory <TType>();

            left(conflictsLeft);

            var conflictsRight = new ValueDiffItemFactory <TType>();

            right(conflictsRight);

            return(this.Conflicted(conflictsLeft, conflictsRight));
        }
예제 #2
0
        public ValueDiffItemFactory <TType> Conflicted(ValueDiffItemFactory <TType> conflictsLeft, ValueDiffItemFactory <TType> conflictsRight)
        {
            this.aDiffItems.Add(new DiffAnyConflicted(conflictsLeft.aDiffItems, conflictsRight.aDiffItems));

            return(this);
        }