boolean (@NotNull SvnVcs vcs, @NotNull VirtualFile file) { FileStatus status = FileStatusManager.getInstance(vcs.getProject()).getStatus(file); return file.isDirectory() || FileStatus.MERGED_WITH_CONFLICTS.equals(status) || FileStatus.MERGED_WITH_BOTH_CONFLICTS.equals(status); }