diff options
| author | Matthias Sohn | 2017-12-18 22:29:46 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2017-12-19 12:49:59 +0000 |
| commit | 463dad2ed6e440a8c90716eed79af50e22dc6be3 (patch) | |
| tree | 104d1b21de67433a0cf789999f7ef231dcd64568 /org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java | |
| parent | a2f2f6539093f3a2a246ab3c09aa8f6c6c325386 (diff) | |
| download | jgit-463dad2ed6e440a8c90716eed79af50e22dc6be3.tar.gz jgit-463dad2ed6e440a8c90716eed79af50e22dc6be3.tar.xz jgit-463dad2ed6e440a8c90716eed79af50e22dc6be3.zip | |
Fix javadoc in org.eclipse.jgit nls and notes package
Change-Id: I1b65fba5b4856f98974dc10f549540d401ef916f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java index 2e7327ca32..87bd4b55b1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/DefaultNoteMerger.java @@ -53,7 +53,7 @@ import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.util.io.UnionInputStream; /** - * Default implementation of the {@link NoteMerger}. + * Default implementation of the {@link org.eclipse.jgit.notes.NoteMerger}. * <p> * If ours and theirs are both non-null, which means they are either both edits * or both adds, then this merger will simply join the content of ours and @@ -67,6 +67,7 @@ import org.eclipse.jgit.util.io.UnionInputStream; */ public class DefaultNoteMerger implements NoteMerger { + /** {@inheritDoc} */ @Override public Note merge(Note base, Note ours, Note theirs, ObjectReader reader, ObjectInserter inserter) throws IOException { |