diff --git a/plugins/git4idea/src/git4idea/actions/GitMergeAction.java b/plugins/git4idea/src/git4idea/actions/GitMergeAction.java index 8f75f07c27b8..d6909ed3dc80 100644 --- a/plugins/git4idea/src/git4idea/actions/GitMergeAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitMergeAction.java @@ -89,15 +89,12 @@ abstract class GitMergeAction extends GitRepositoryAction { AccessToken token = DvcsUtil.workingTreeChangeStarted(project); try { - GitCommandResult result = git.runCommand(new Computable() { - @Override - public GitLineHandler compute() { - GitLineHandler handler = handlerProvider.compute(); - handler.addLineListener(localChangesDetector); - handler.addLineListener(untrackedFilesDetector); - handler.addLineListener(mergeConflict); - return handler; - } + GitCommandResult result = git.runCommand(() -> { + GitLineHandler handler = handlerProvider.compute(); + handler.addLineListener(localChangesDetector); + handler.addLineListener(untrackedFilesDetector); + handler.addLineListener(mergeConflict); + return handler; }); GitRepository repository = repositoryManager.getRepositoryForRoot(selectedRoot);