Merge branch 'branch-context'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 8 Sep 2017 11:28:48 +0000 (14:28 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 8 Sep 2017 11:28:48 +0000 (14:28 +0300)
# Conflicts:
# platform/platform-api/src/com/intellij/notification/NotificationGroup.java
# platform/platform-resources/src/META-INF/PlatformExtensions.xml

1  2 
platform/platform-resources/src/META-INF/PlatformExtensions.xml
plugins/git4idea/git4idea.iml
plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt

index 4fdc23687b44644c41ba604857aeac2ff2bd0605,7e0e66cb90fa39a50545a03ebfdbecc6636f6ada..642ee3b98532a63f6648326f4ca5ce1fd2dff3a4
      <tasks.contextProvider implementation="com.intellij.tasks.context.XDebuggerBreakpointsContextProvider"/>
      <tasks.contextProvider implementation="com.intellij.tasks.context.XDebuggerWatchesProvider"/>
  
 +    <actionPromoter implementation="com.intellij.execution.testframework.TestTreeViewActionsPromoter"/>
 +    <smartSelectProvider implementation="com.intellij.ui.tree.TreeSmartSelectProvider"/>
+     <postStartupActivity implementation="com.intellij.tasks.context.BranchContextTracker$TrackerStartupActivity"/>
    </extensions>
  </idea-plugin>
Simple merge