From 66909cd7a6077298d237b44fd5c116a7c0e814f4 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Sun, 27 Jul 2014 15:13:36 +1000
Subject: [PATCH] Fix Javadoc errors with Java 8

Bug: 440414
Change-Id: Icce87bd23a3698513b76246677f1d45ddbcaab47
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 .../src/org/eclipse/jgit/api/MergeResult.java     |  6 +++---
 .../src/org/eclipse/jgit/diff/Edit.java           | 15 +++++++--------
 .../src/org/eclipse/jgit/merge/ResolveMerger.java |  1 +
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
index 2def12f1a..9dc33b5ad 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
@@ -483,10 +483,10 @@ public class MergeResult {
 	 * for (String path : allConflicts.keySet()) {
 	 * 	int[][] c = allConflicts.get(path);
 	 * 	System.out.println("Conflicts in file " + path);
-	 * 	for (int i = 0; i < c.length; ++i) {
+	 * 	for (int i = 0; i &lt; c.length; ++i) {
 	 * 		System.out.println("  Conflict #" + i);
-	 * 		for (int j = 0; j &lt;	 (c[i].length) - 1; ++j) {
-	 * 			if (c[i][j] >= 0)
+	 * 		for (int j = 0; j &lt; (c[i].length) - 1; ++j) {
+	 * 			if (c[i][j] &gt;= 0)
 	 * 				System.out.println("    Chunk for "
 	 * 						+ m.getMergedCommits()[j] + " starts on line #"
 	 * 						+ c[i][j]);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java
index 57a2018ab..7eecd1351 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java
@@ -51,16 +51,15 @@ package org.eclipse.jgit.diff;
  * Regions should be specified using 0 based notation, so add 1 to the start and
  * end marks for line numbers in a file.
  * <p>
- * An edit where <code>beginA == endA && beginB &lt; endB</code> is an insert
- * edit, that is sequence B inserted the elements in region
- * <code>[beginB, endB)</code> at <code>beginA</code>.
+ * An edit where {@code beginA == endA && beginB < endB} is an insert edit, that
+ * is sequence B inserted the elements in region <code>[beginB, endB)</code> at
+ * <code>beginA</code>.
  * <p>
- * An edit where <code>beginA &lt; endA && beginB == endB</code> is a delete
- * edit, that is sequence B has removed the elements between
- * <code>[beginA, endA)</code>.
+ * An edit where {@code beginA < endA && beginB == endB} is a delete edit, that
+ * is sequence B has removed the elements between <code>[beginA, endA)</code>.
  * <p>
- * An edit where <code>beginA &lt; endA && beginB &lt; endB</code> is a replace
- * edit, that is sequence B has replaced the range of elements between
+ * An edit where {@code beginA < endA && beginB < endB} is a replace edit, that
+ * is sequence B has replaced the range of elements between
  * <code>[beginA, endA)</code> with those found in <code>[beginB, endB)</code>.
  */
 public class Edit {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index a5e30b6e2..712bb0d35 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -444,6 +444,7 @@ public class ResolveMerger extends ThreeWayMerger {
 	 * conflict is detected the content-merge algorithm will try to write a
 	 * merged version into the working-tree. If the file is dirty we would
 	 * override unsaved data.</li>
+	 * </ul>
 	 *
 	 * @param base
 	 *            the common base for ours and theirs