diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt index 9f8977d52ee4..a83a3dde85de 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt @@ -274,8 +274,6 @@ open class MultipleFileMergeDialog( } private fun acceptFileRevision(file: VirtualFile, resolution: MergeSession.Resolution) { - if (mergeSession?.canMerge(file) == false) return - if (!DiffUtil.makeWritable(project, file)) { throw IOException("File is read-only: " + file.presentableName) }