Uses of Interface
org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool

Packages that use ExternalMergeTool

Package	Description
org.eclipse.jgit.internal.diffmergetool

Uses of ExternalMergeTool in org.eclipse.jgit.internal.diffmergetool

Classes in org.eclipse.jgit.internal.diffmergetool that implement ExternalMergeTool

Modifier and Type	Class	Description
class	PreDefinedMergeTool	The pre-defined merge tool.
class	UserDefinedMergeTool	The user-defined merge tool.

Methods in org.eclipse.jgit.internal.diffmergetool that return types with arguments of type ExternalMergeTool

Modifier and Type	Method	Description
Map<String,ExternalMergeTool>	MergeTools.getPredefinedTools(boolean checkAvailability)	Get predefined tools map.
Map<String,ExternalMergeTool>	MergeToolConfig.getTools()
Map<String,ExternalMergeTool>	MergeTools.getUserDefinedTools()

Methods in org.eclipse.jgit.internal.diffmergetool with parameters of type ExternalMergeTool

Modifier and Type	Method	Description
FS.ExecutionResult	MergeTools.merge(FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile, File tempDir, ExternalMergeTool tool)	Merge two versions of a file with optional base file.