From c5941eda364b892cb5a3e202d5836db95eac681c Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 21 Jun 2018 13:36:52 +0300 Subject: [PATCH] git: don't ask canMerge in acceptFileRevision in MultipleFilesMergeDialog Follow-up to fc52239 This commit is made for consistency: if we use canMerge to check if the Merge button can be pressed, then it should be so for both MergeSession implementations. --- .../com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt | 2 -- 1 file changed, 2 deletions(-) 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) }