diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java index 7df35c925c..3b71373b6e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/CheckoutConflictException.java @@ -53,7 +53,6 @@ public class CheckoutConflictException extends GitAPIException { * * @param conflictingPaths * list of conflicting paths - * * @param e * a {@link org.eclipse.jgit.errors.CheckoutConflictException} * exception @@ -82,7 +81,11 @@ public class CheckoutConflictException extends GitAPIException { this.conflictingPaths = conflictingPaths; } - /** @return all the paths where unresolved conflicts have been detected */ + /** + * Get conflicting paths + * + * @return all the paths where unresolved conflicts have been detected + */ public List<String> getConflictingPaths() { return conflictingPaths; } |