return unmergedFiles;
}
private Collection<VirtualFile> getUnmergedFiles(@NotNull VirtualFile root) throws VcsException {
return unmergedFiles(root);
}
<BUG>private List<VirtualFile> unmergedFiles(VirtualFile root) throws VcsException {

HashSet<VirtualFile> unmerged = new HashSet<VirtualFile>();
String rootPath = root.getPath();</BUG>
GitRepository repository = myRepositoryManager.getRepositoryForRoot(root);

return unmergedFiles;
}
private Collection<VirtualFile> getUnmergedFiles(@NotNull VirtualFile root) throws VcsException {
return unmergedFiles(root);
}
private List<VirtualFile> unmergedFiles(final VirtualFile root) throws VcsException {
GitRepository repository = myRepositoryManager.getRepositoryForRoot(root);
