From fa5582f3fea490e56b5d7ef97501968e57d8ee64 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 3 May 2013 10:21:50 -0700 Subject: [PATCH] Merger: clarify getBaseCommit javadoc Change-Id: Ic52475248a545d51d3d8ac31a24f0344a1241e45 --- org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java index 6dba41298..ffe80aacd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java @@ -193,11 +193,15 @@ public abstract class Merger { /** * Return the merge base of two commits. + *

+ * May only be called after {@link #merge(RevCommit...)}. * * @param aIdx - * index of the first commit in {@link #sourceObjects}. + * index of the first commit in tips passed to + * {@link #merge(RevCommit...)}. * @param bIdx - * index of the second commit in {@link #sourceObjects}. + * index of the second commit in tips passed to + * {@link #merge(RevCommit...)}. * @return the merge base of two commits * @throws IncorrectObjectTypeException * one of the input objects is not a commit.