[git-index] add "Merge" action to the context menu
authorJulia Beliaeva <Julia.Beliaeva@jetbrains.com>
Tue, 11 Aug 2020 23:32:15 +0000 (02:32 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Wed, 12 Aug 2020 20:52:11 +0000 (20:52 +0000)
commitfe6227cbca281bbf35e29025dfa38b15df9467b2
treef890711f003a02ff90003b42e4206168da1fdd14
parentc555b064b99d880567665db97634d2c39b1fb54c
[git-index] add "Merge" action to the context menu

GitOrigin-RevId: 74f06c14003143e4e6f2c2730960117aaa8c9095
plugins/git4idea/resources/META-INF/plugin.xml
plugins/git4idea/src/git4idea/index/actions/GitAcceptConflictSideAction.kt