Package com.intellij.openapi.vcs.merge

Interface MergeProvider2

All Superinterfaces:

MergeProvider

All Known Implementing Classes:

GitMergeProvider

public interface MergeProvider2
extends MergeProvider

Merge provider which allows plugging into the functionality of the Multiple File Merge dialog.

Method Summary

Modifier and Type	Method and Description
MergeSession	createMergeSession(java.util.List<VirtualFile> files) Initiates a multiple file merge operation for the specified list of files.

Methods inherited from interface com.intellij.openapi.vcs.merge.MergeProvider

conflictResolvedForFile, createDefaultMergeDialogCustomizer, isBinary, loadRevisions

Method Detail

createMergeSession

MergeSession createMergeSession(java.util.List<VirtualFile> files)

Initiates a multiple file merge operation for the specified list of files.

Parameters:

files - the list of files to be merged.

Returns:

the merge session instance.