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 Details

    • UserDefinedMergeTool

      public UserDefinedMergeTool(String name, String path, String cmd, BooleanTriState trustExitCode)
      Creates the merge tool
      Parameters:
      name - the name
      path - the path
      cmd - the command
      trustExitCode - the "trust exit code" option
  • Method Details

    • getTrustExitCode

      public BooleanTriState getTrustExitCode()
      Description copied from interface: ExternalMergeTool
      Get the tool "trust exit code" option
      Specified by:
      getTrustExitCode in interface ExternalMergeTool
      Returns:
      the "trust exit code" flag
    • setTrustExitCode

      protected void setTrustExitCode(BooleanTriState trustExitCode)
      Set "trust exit code" flag
      Parameters:
      trustExitCode - the new "trust exit code" flag
    • getCommand

      public String getCommand(boolean withBase)
      Get command
      Specified by:
      getCommand in interface ExternalMergeTool
      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