diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java index 1127b89a90..72857ffb30 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java @@ -87,7 +87,7 @@ public class MergeChunk { * * @param sequenceIndex * determines to which sequence this chunks belongs to. Same as - * in {@link MergeResult#add(int, int, int, ConflictState)} + * in {@link org.eclipse.jgit.merge.MergeResult#add} * @param begin * the first element from the specified sequence which should be * included in the merge result. Indexes start with 0. @@ -109,8 +109,7 @@ public class MergeChunk { /** * @return the index of the sequence to which sequence this chunks belongs - * to. Same as in - * {@link MergeResult#add(int, int, int, ConflictState)} + * to. Same as in {@link org.eclipse.jgit.merge.MergeResult#add} */ public int getSequenceIndex() { return sequenceIndex; |