boolean () { LOG.info("areUnmergedFiles: checking if there are unmerged files..."); GitConflictResolver.Params params = new GitConflictResolver.Params(myProject); params.setErrorNotificationTitle(GitBundle.message("update.process.generic.error.title")); params.setMergeDescription(GitBundle.message("update.process.error.message.unmerged.files")); return !new GitMergeCommittingConflictResolver(myProject, myGit, myMerger, getRootsFromRepositories(myRepositories), params, false).merge(); }