diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-09-16 22:14:49 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-09-25 22:06:13 +0200 |
| commit | 84ced89dc3d3163535cb170f4a6da49b60a51c3f (patch) | |
| tree | 036d51e581ce2be3b7d3390fe620c149be171af4 /org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java | |
| parent | d56ae55c836968e09d1ad887d4180ff6bccc5be7 (diff) | |
| download | jgit-84ced89dc3d3163535cb170f4a6da49b60a51c3f.tar.gz jgit-84ced89dc3d3163535cb170f4a6da49b60a51c3f.zip | |
[errorprone] Add missing javadoc summary
see https://google.github.io/styleguide/javaguide.html#s7.2-summary-fragment
Change-Id: Iaf4a6b55d4e4c59b7a2da3451164abb1bb47d4a1
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java index 668f46dd72..d8287f45d1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineMergeTool.java @@ -287,6 +287,8 @@ public enum CommandLineMergeTool { private final boolean exitCodeTrustable; /** + * Get path + * * @return path */ public String getPath() { @@ -294,6 +296,8 @@ public enum CommandLineMergeTool { } /** + * Get parameters + * * @param withBase * return parameters with base present? * @return parameters with or without base present @@ -306,6 +310,8 @@ public enum CommandLineMergeTool { } /** + * Whether exit code can be trusted + * * @return parameters */ public boolean isExitCodeTrustable() { @@ -313,6 +319,8 @@ public enum CommandLineMergeTool { } /** + * Whether command with with base present is valid + * * @return true if command with base present is valid, false otherwise */ public boolean canMergeWithoutBasePresent() { |