merge: show gutter actions in DumbMode
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Mon, 10 Aug 2015 11:08:14 +0000 (14:08 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Mon, 10 Aug 2015 11:08:14 +0000 (14:08 +0300)
platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java

index 78109ed5947622babb3ef4c1ebf14a60f6151229..7e2d7a6711a5bbd8c3f969156da7070843576531 100644 (file)
@@ -376,6 +376,11 @@ public class TextMergeChange extends ThreesideDiffChangeBase {
       public String getTooltipText() {
         return tooltipText;
       }
+
+      @Override
+      public boolean isDumbAware() {
+        return true;
+      }
     };
   }