From fccda13036cbd94a289da2a34ebf6659cfebc1be Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 30 Oct 2016 16:51:15 +0300
Subject: [PATCH] Use proper invokeLater

---
 plugins/git4idea/src/git4idea/merge/GitMergeUtil.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java b/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
index ddc285718ce2..1171b1e0aee8 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java
@@ -31,7 +31,6 @@ import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.GuiUtils;
-import com.intellij.util.ui.UIUtil;
 import git4idea.GitRevisionNumber;
 import git4idea.GitVcs;
 import git4idea.i18n.GitBundle;
@@ -135,12 +134,12 @@ public class GitMergeUtil {
     collector.collect(files, exceptions);
     if (!exceptions.isEmpty()) return;
 
-    UIUtil.invokeLaterIfNeeded(() -> {
+    GuiUtils.invokeLaterIfNeeded(() -> {
       ProjectLevelVcsManagerEx manager = (ProjectLevelVcsManagerEx)ProjectLevelVcsManager.getInstance(project);
       UpdateInfoTree tree = manager.showUpdateProjectInfo(files, actionName, actionInfo, false);
       tree.setBefore(beforeLabel);
       tree.setAfter(LocalHistory.getInstance().putSystemLabel(project, "After update"));
-    });
+    }, ModalityState.defaultModalityState());
 
     Collection<String> unmergedNames = files.getGroupById(FileGroup.MERGED_WITH_CONFLICT_ID).getFiles();
     if (!unmergedNames.isEmpty()) {