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>
This commit is contained in:
parent
adbf0541dc
commit
66909cd7a6
|
@ -483,10 +483,10 @@ public void addConflict(String path, org.eclipse.jgit.merge.MergeResult<?> lowLe
|
|||
* 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 < c.length; ++i) {
|
||||
* System.out.println(" Conflict #" + i);
|
||||
* for (int j = 0; j < (c[i].length) - 1; ++j) {
|
||||
* if (c[i][j] >= 0)
|
||||
* for (int j = 0; j < (c[i].length) - 1; ++j) {
|
||||
* if (c[i][j] >= 0)
|
||||
* System.out.println(" Chunk for "
|
||||
* + m.getMergedCommits()[j] + " starts on line #"
|
||||
* + c[i][j]);
|
||||
|
|
|
@ -51,16 +51,15 @@
|
|||
* 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 < 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 < 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 < endA && beginB < 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 {
|
||||
|
|
|
@ -444,6 +444,7 @@ private DirCacheEntry keep(DirCacheEntry e) {
|
|||
* 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
|
||||
|
|
Loading…
Reference in New Issue