Uses of Class
org.eclipse.jgit.internal.diffmergetool.FileElement
Packages that use FileElement
-
Uses of FileElement in org.eclipse.jgit.internal.diffmergetool
Methods in org.eclipse.jgit.internal.diffmergetool with parameters of type FileElementModifier and TypeMethodDescriptionDiffTools.compare
(FileElement localFile, FileElement remoteFile, Optional<String> toolName, BooleanTriState prompt, boolean gui, BooleanTriState trustExitCode, PromptContinueHandler promptHandler, InformNoToolHandler noToolHandler) Compare two versions of a file.DiffTools.compare
(FileElement localFile, FileElement remoteFile, ExternalDiffTool tool, boolean trustExitCode) Compare two versions of a file.MergeTools.merge
(FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile, File tempDir, Optional<String> toolName, BooleanTriState prompt, boolean gui, PromptContinueHandler promptHandler, InformNoToolHandler noToolHandler) Merge two versions of a file with optional base file.MergeTools.merge
(FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile, File tempDir, ExternalMergeTool tool) Merge two versions of a file with optional base file.static String
ExternalToolUtils.prepareCommand
(String command, FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile) Prepare command for execution.ExternalToolUtils.prepareEnvironment
(File gitDir, FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile) Prepare environment needed for execution.