diff options
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelWorkingFile.java')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelWorkingFile.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelWorkingFile.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelWorkingFile.java index 20fb7830ae..53c773d53f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelWorkingFile.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/model/GitModelWorkingFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2010, Dariusz Luksza <dariusz@luksza.org> + * Copyright (C) 2010,2011 Dariusz Luksza <dariusz@luksza.org> * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -17,9 +17,6 @@ import static org.eclipse.jgit.lib.ObjectId.zeroId; import java.io.IOException; import org.eclipse.core.runtime.IPath; -import org.eclipse.egit.ui.internal.synchronize.compare.ComparisonDataSource; -import org.eclipse.egit.ui.internal.synchronize.compare.GitCompareInput; -import org.eclipse.egit.ui.internal.synchronize.compare.GitLocalCompareInput; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; @@ -34,13 +31,6 @@ public class GitModelWorkingFile extends GitModelBlob { } @Override - protected GitCompareInput getCompareInput(ComparisonDataSource baseData, - ComparisonDataSource remoteData, ComparisonDataSource ancestorData) { - return new GitLocalCompareInput(getRepository(), ancestorData, - baseData, remoteData, gitPath); - } - - @Override public int getKind() { if (kind != LEFT && kind != RIGHT) return kind; |