diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java index 0c3ddf9afe..022cd27f44 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalMergeTool.java @@ -18,11 +18,15 @@ import org.eclipse.jgit.lib.internal.BooleanTriState; public interface ExternalMergeTool extends ExternalDiffTool { /** + * Get the tool "trust exit code" option + * * @return the tool "trust exit code" option */ BooleanTriState getTrustExitCode(); /** + * Get tool command + * * @param withBase * get command with base present (true) or without base present * (false) |