resolve same additions on both sides automatically

Author: janjanech

SharpDiffLib.Test/MergeDiffs/ArrayOfPrimitives.cs

@@ -144,6 +144,30 @@ public void BothSidesAddedOne()
 			Assert.IsTrue(conflicts.HasConflicts);
 		}
 
+		[TestMethod]
+		public void BothSidesAddedSame()
+		{
+			var left = DiffResultFactory.Ordered<int>.Create()
+				.Added(3, 3)
+				.Added(3, 4)
+				.MakeDiff();
+			var right = DiffResultFactory.Ordered<int>.Create()
+				.Added(3, 3)
+				.Added(3, 4)
+				.MakeDiff();
+
+			IConflictContainer conflicts;
+			var result = Merger.Instance.Partial.MergeDiffs(left, right, out conflicts);
+
+			var merged = DiffResultFactory.Ordered<int>.Create()
+				.Added(3, 3)
+				.Added(3, 4)
+				.MakeDiff();
+
+			Assert.AreEqual(merged, result);
+			Assert.IsFalse(conflicts.HasConflicts);
+		}
+
 		[TestMethod]
 		public void BothSidesAddedTwo()
 		{

SharpDiffLib/algorithms/mergeDiffs/collection/ordered/MergeOrderedCollectionDiffs.cs

@@ -69,9 +69,16 @@ private void ProcessConflicts(List<IDiffItem> ret, List<IDiffOrderedCollectionIt
 
 			if (addedRight != null && addedLeft != null)
 			{
-				DiffAnyConflicted conflict = new DiffAnyConflicted(addedLeft, addedRight);
-				ret.Add(conflict);
-				conflicts.RegisterConflict(conflict);
+				if (addedLeft.Count == addedRight.Count && addedLeft.Zip(addedRight, (a, b) => a.IsSame(b)).All(x => x))
+				{
+					ret.AddRange(addedLeft);
+				}
+				else
+				{
+					DiffAnyConflicted conflict = new DiffAnyConflicted(addedLeft, addedRight);
+					ret.Add(conflict);
+					conflicts.RegisterConflict(conflict);
+				}
 			}
 			else if (addedLeft != null)
 			{