diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeProvider.java b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeProvider.java index e7df802d6677..c1249d910a2c 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeProvider.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeProvider.java @@ -6,8 +6,6 @@ import com.intellij.openapi.vcs.VcsProviderMarker; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; -import java.util.List; - public interface MergeProvider extends VcsProviderMarker { @NotNull @@ -20,12 +18,6 @@ public interface MergeProvider extends VcsProviderMarker { boolean isBinary(@NotNull VirtualFile file); - /** - * Called after a multiple file merge operation with the specified list of files has been completed. - */ - default void mergeDone(@NotNull List files) { - } - /** * Creates a merge dialog customizer used when the default "Resolve conflicts" operation is invoked. */ diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java index e93be6adbe8d..e208ec277335 100644 --- a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java +++ b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java @@ -471,13 +471,6 @@ public class GitMergeProvider implements MergeProvider2 { return new MyMergeSession(files); } - @Override - public void mergeDone(@NotNull List files) { - for (GitRepository repository : GitUtil.getRepositoriesForFiles(myProject, files)) { - repository.update(); - } - } - @Override public MergeDialogCustomizer createDefaultMergeDialogCustomizer() { return new GitDefaultMergeDialogCustomizer(this);