aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-02-16 18:09:12 (EST)
committerTomasz Zarna2013-02-16 18:09:12 (EST)
commit0cfb8c8e3f469225b81064f89305293d956d362c (patch)
tree163176c878ac64d231377d7ae65e32b1cf7ff2f3
parent507bfac0f77a8ca7179ffde0d2f9852a97162a7e (diff)
downloadegit-0cfb8c8e3f469225b81064f89305293d956d362c.zip
egit-0cfb8c8e3f469225b81064f89305293d956d362c.tar.gz
egit-0cfb8c8e3f469225b81064f89305293d956d362c.tar.bz2
rightCommit param in GitMergeEditorInput#buildDiffContainer is unusedrefs/changes/10/10410/1
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
index 0cbcca4..ff669c2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java
@@ -216,7 +216,7 @@ public class GitMergeEditorInput extends CompareEditorInput {
// build the nodes
try {
- return buildDiffContainer(repo, rightCommit, headCommit,
+ return buildDiffContainer(repo, headCommit,
ancestorCommit, filterPaths, rw, monitor);
} catch (IOException e) {
throw new InvocationTargetException(e);
@@ -242,7 +242,7 @@ public class GitMergeEditorInput extends CompareEditorInput {
}
private IDiffContainer buildDiffContainer(Repository repository,
- RevCommit rightCommit, RevCommit headCommit,
+ RevCommit headCommit,
RevCommit ancestorCommit, List<String> filterPaths, RevWalk rw,
IProgressMonitor monitor) throws IOException, InterruptedException {