void (final List<VirtualFile> merged) { final FileGroup conflictedGroup = myUpdatedFiles.getGroupById(groupId); FileGroup mergedGroup = myUpdatedFiles.getGroupById(FileGroup.MERGED_ID); for (VirtualFile mergedFile: merged) { final String path = FileUtil.toSystemDependentName(mergedFile.getPresentableUrl()); final VcsRevisionNumber revision = conflictedGroup.getRevision(myVcsManager, path); conflictedGroup.remove(path); mergedGroup.add(path, myVcs.getKeyInstanceMethod(), revision); } }