void (@NotNull ProgressIndicator indicator) { try { VirtualFile root = GitUtil.getRootForFile(project, filePath); boolean fileTouched = wasFileTouched(project, root, rev); Collection<GitFileRevision> parents = findParentRevisions(root, rev, parentHashes, revisions); myInfo = new MergeCommitPreCheckInfo(fileTouched, parents); } catch (VcsException e) { showError(e, GitBundle.message("git.history.diff.handler.git.show.error", rev, filePath)); } }