private @NotNull Collection<GitFileRevision> findParentRevisions(@NotNull VirtualFile root,
                                                                   @NotNull GitFileRevision currentRevision,
                                                                   @NotNull Collection<String> parentHashes,
                                                                   @Nullable List<? extends VcsFileRevision> revisions) throws VcsException {
    // currentRevision is a merge revision.
    // the file could be renamed in one of the branches, i.e. the name in one of the parent revisions may be different from the name
    // in currentRevision. It can be different even in both parents, but it would a rename-rename conflict, and we don't handle such anyway.

    Collection<GitFileRevision> parents = new ArrayList<>(parentHashes.size());
    for (String parentHash : parentHashes) {
      parents.add(createParentRevision(root, currentRevision, parentHash, revisions));
    }
    return parents;
  }
private @NotNull Collection<GitFileRevision> findParentRevisions(@NotNull VirtualFile root,
                                                                   @NotNull GitFileRevision currentRevision,
                                                                   @NotNull Collection<String> parentHashes,
                                                                   @Nullable List<? extends VcsFileRevision> revisions)