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

            left(conflictsLeft);

            var conflictsRight = new UnorderedDiffItemFactory <TType, TValue>();

            right(conflictsRight);

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

            return(this);
        }