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 15082070a551..9f8977d52ee4 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 @@ -249,15 +249,13 @@ open class MultipleFileMergeDialog( try { if (mergeSession is MergeSessionEx) { - val supportedFiles = files.filter { file -> mergeSession.canMerge(file) } + mergeSession.acceptFilesRevisions(files, resolution) - mergeSession.acceptFilesRevisions(supportedFiles, resolution) - - for (file in supportedFiles) { + for (file in files) { checkMarkModifiedProject(file) } - markFilesProcessed(supportedFiles, resolution) + markFilesProcessed(files, resolution) } else { for (file in files) {