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)
commitb3eccb94500b85f5c5dc3f616aec37d478727753
tree38a91b96d6727342682c18ba783f47ca529de256
parentfced9fc3cac285242d03955bb7636319bb48acc4
parent81db129ec12e6c8ef2975d6e88cd62715926a6ec
Merge branch 'branch-context'

# Conflicts:
# platform/platform-api/src/com/intellij/notification/NotificationGroup.java
# platform/platform-resources/src/META-INF/PlatformExtensions.xml
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