diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java index 94fba0fc61..796f1d1d89 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NotesMergeConflictException.java @@ -49,8 +49,9 @@ import java.text.MessageFormat; import org.eclipse.jgit.internal.JGitText; /** - * This exception will be thrown from the {@link NoteMerger} when a conflict on - * Notes content is found during merge. + * This exception will be thrown from the + * {@link org.eclipse.jgit.notes.NoteMerger} when a conflict on Notes content is + * found during merge. */ public class NotesMergeConflictException extends IOException { private static final long serialVersionUID = 1L; |