diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleConflict.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleConflict.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleConflict.java b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleConflict.java index f09e1a5171..e324ab1afc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleConflict.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleConflict.java @@ -71,8 +71,10 @@ public class SubmoduleConflict extends Sequence { } /** - * @return the object id for the conflicting submodule - */ + * Get objectId for the conflicting submodule + * + * @return the object id for the conflicting submodule + */ public ObjectId getObjectId() { return objectId; } |