Package com.intellij.openapi.vcs.merge

Interface MergeProvider

All Known Subinterfaces:

MergeProvider2

All Known Implementing Classes:

CvsMergeProvider, GitMergeProvider, HgMergeProvider, SvnMergeProvider

public interface MergeProvider

Method Summary

Modifier and Type	Method and Description
void	conflictResolvedForFile(VirtualFile file) called for text conflict
default MergeDialogCustomizer	createDefaultMergeDialogCustomizer() Creates a merge dialog customizer used when the default "Resolve conflicts" operation is invoked.
boolean	isBinary(VirtualFile file)
MergeData	loadRevisions(VirtualFile file)

Method Detail

loadRevisions

MergeData loadRevisions(VirtualFile file)
                 throws VcsException

Throws:

VcsException

conflictResolvedForFile

void conflictResolvedForFile(VirtualFile file)

called for text conflict

isBinary

boolean isBinary(VirtualFile file)

createDefaultMergeDialogCustomizer

default MergeDialogCustomizer createDefaultMergeDialogCustomizer()

Creates a merge dialog customizer used when the default "Resolve conflicts" operation is invoked.