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

test fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2013-08-07 15:22:38 +04:00
parent d9cd1c0302
commit fd8d64ae1e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/GitMergeOperation.java
+2 -2
View File
@@ -19,7 +19,6 @@ import com.intellij.dvcs.DvcsUtil;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -28,6 +27,7 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ui.UIUtil;
import git4idea.GitPlatformFacade;
import git4idea.GitUtil;
import git4idea.GitVcs;
@@ -160,7 +160,7 @@ class GitMergeOperation extends GitBranchOperation {
switch (myDeleteOnMerge) {
case DELETE:
super.notifySuccess(message);
ApplicationManager.getApplication().invokeLater(new Runnable() { // bg process needs to be started from the EDT
UIUtil.invokeLaterIfNeeded(new Runnable() { // bg process needs to be started from the EDT
@Override
public void run() {
GitBrancher brancher = ServiceManager.getService(myProject, GitBrancher.class);