Remove unused class RevUtils.ConflictCommits
It's unused since commit b51a1c86.
Change-Id: Ia7c3ada673eaf955e5d6703d4f4f3c0e610ab5b0
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java
index c3a6c37..3a6b4f3 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/RevUtils.java
@@ -184,34 +184,4 @@
}
return false;
}
-
- /**
- * The interesting commits from ours/theirs for a file in case of a
- * conflict.
- */
- public static class ConflictCommits {
- private final RevCommit ourCommit;
- private final RevCommit theirCommit;
-
- private ConflictCommits(RevCommit ourCommit, RevCommit theirCommit) {
- this.ourCommit = ourCommit;
- this.theirCommit = theirCommit;
- }
-
- /**
- * @return the commit from "ours" that last modified a file, or
- * {@code null} if none found
- */
- public RevCommit getOurCommit() {
- return ourCommit;
- }
-
- /**
- * @return the commit from "theirs" that last modified a file, or
- * {@code null} if none found
- */
- public RevCommit getTheirCommit() {
- return theirCommit;
- }
- }
}
