Class UserDefinedMergeTool

    • Constructor Detail

      • 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 Detail

      • setTrustExitCode

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

        public String getCommand​(boolean withBase)
        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