Delete unused org.eclipse.egit.core.internal.merge
commit83c4fcf3650985c1c596c206cf4a513b90e4af08
authorThomas Wolf <thomas.wolf@paranor.ch>
Fri, 30 Dec 2016 23:16:39 +0000 (31 00:16 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 10 Jan 2017 09:24:29 +0000 (10 05:24 -0400)
treeda7852fd690ee57483f370a7d9e16a14eb2f7717
parentda861809bcd23556fd13c6f4033541cce63b4912
Delete unused org.eclipse.egit.core.internal.merge

These classes duplicate functionality in org.eclipse.core.synchronize.
They were added in an abandoned attempt to move some functionality
from EMF Compare into EGit, but they were never used, not even by
EMF Compare. This attempt was later superseded by the "mergeStrategy"
extension point.

Bug: 418151
Change-Id: I8fcad2d2e9e11c681ce41fe99faa9745e79597b8
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
14 files changed:
org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProviderTest.java [deleted file]
org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriberTest.java [deleted file]
org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/ResourceVariantTest.java [deleted file]
org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProviderTest.java [deleted file]
org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/merge/VariantsTestCase.java [deleted file]
org.eclipse.egit.core/META-INF/MANIFEST.MF
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/DirCacheResourceVariantTreeProvider.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitCachedResourceVariantTree.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantCache.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantFileRevision.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeProvider.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitResourceVariantTreeSubscriber.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/GitSyncInfoToDiffConverter.java [deleted file]
org.eclipse.egit.core/src/org/eclipse/egit/core/internal/merge/TreeWalkResourceVariantTreeProvider.java [deleted file]