List<FilePath> (@NotNull List<String> mergeOutput) { final List<FilePath> paths = new ArrayList<>(); for (String line : mergeOutput) { if (StringUtil.isEmptyOrSpaces(line)) { continue; } if (line.contains("Please, commit your changes or stash them before you can merge")) { break; } line = line.trim(); final String path; try { path = myRoot.getPath() + "/" + GitUtil.unescapePath(line); final File file = new File(path); if (file.exists()) { paths.add(VcsUtil.getFilePath(file, false)); } } catch (VcsException e) { // just continue } } return paths; }