[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
authorJulia Beliaeva <Julia.Beliaeva@jetbrains.com>
Wed, 12 Aug 2020 14:41:10 +0000 (17:41 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Wed, 12 Aug 2020 20:52:12 +0000 (20:52 +0000)
commit56dc1fbd72066e287bc90599876f8f4e859b23d2
treeb4842408562aeef6cd8f57ed1b339110c7e1e325
parentfe6227cbca281bbf35e29025dfa38b15df9467b2
[git-index] rename GitAcceptConflictSideAction file to GitConflictActions

GitOrigin-RevId: 29f3fbbc61d66721fa7c4edca0a482fe91a158a7
plugins/git4idea/src/git4idea/index/actions/GitConflictActions.kt [moved from plugins/git4idea/src/git4idea/index/actions/GitAcceptConflictSideAction.kt with 100% similarity]