Class UserDefinedMergeTool
- java.lang.Object
-
- org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool
-
- org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool
-
- All Implemented Interfaces:
ExternalDiffTool
,ExternalMergeTool
- Direct Known Subclasses:
PreDefinedMergeTool
public class UserDefinedMergeTool extends UserDefinedDiffTool implements ExternalMergeTool
The user-defined merge tool.
-
-
Constructor Summary
Constructors Constructor Description UserDefinedMergeTool(String name, String path, String cmd, BooleanTriState trustExitCode)
Creates the merge tool
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description String
getCommand(boolean withBase)
BooleanTriState
getTrustExitCode()
protected void
setTrustExitCode(BooleanTriState trustExitCode)
-
Methods inherited from class org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool
getCommand, getName, getPath, isAvailable, setAvailable, setPath
-
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Methods inherited from interface org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool
getCommand, getName, getPath, isAvailable
-
-
-
-
Constructor Detail
-
UserDefinedMergeTool
public UserDefinedMergeTool(String name, String path, String cmd, BooleanTriState trustExitCode)
Creates the merge tool- Parameters:
name
- the namepath
- the pathcmd
- the commandtrustExitCode
- the "trust exit code" option
-
-
Method Detail
-
getTrustExitCode
public BooleanTriState getTrustExitCode()
- Specified by:
getTrustExitCode
in interfaceExternalMergeTool
- Returns:
- the "trust exit code" flag
-
setTrustExitCode
protected void setTrustExitCode(BooleanTriState trustExitCode)
- Parameters:
trustExitCode
- the new "trust exit code" flag
-
getCommand
public String getCommand(boolean withBase)
- Specified by:
getCommand
in interfaceExternalMergeTool
- Parameters:
withBase
- not used, because user-defined merge tool can only define one cmd -> it must handle with and without base present (empty)- Returns:
- the tool command
-
-