MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Lambdify

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-10-19 16:55:10 +03:00
parent b96eeb8ad3
commit 8eeb77ad1e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/actions/GitMergeAction.java
+6 -9
View File
@@ -89,15 +89,12 @@ abstract class GitMergeAction extends GitRepositoryAction {
AccessToken token = DvcsUtil.workingTreeChangeStarted(project);
try {
GitCommandResult result = git.runCommand(new Computable<GitLineHandler>() {
@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);