Uses of Interface
org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool
Packages that use ExternalMergeTool
-
Uses of ExternalMergeTool in org.eclipse.jgit.internal.diffmergetool
Classes in org.eclipse.jgit.internal.diffmergetool that implement ExternalMergeToolModifier and TypeClassDescriptionclass
The pre-defined merge tool.class
The user-defined merge tool.Methods in org.eclipse.jgit.internal.diffmergetool that return types with arguments of type ExternalMergeToolModifier and TypeMethodDescriptionMergeTools.getPredefinedTools
(boolean checkAvailability) Get predefined tools map.MergeToolConfig.getTools()
Get the tools mapMergeTools.getUserDefinedTools()
Get user defined toolsMethods in org.eclipse.jgit.internal.diffmergetool with parameters of type ExternalMergeToolModifier and TypeMethodDescriptionMergeTools.merge
(FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile, File tempDir, ExternalMergeTool tool) Merge two versions of a file with optional base file.