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

            left(conflictsLeft);

            var conflictsRight = new ClassDiffItemFactory <TType>();

            right(conflictsRight);

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

            return(this);
        }