projects / idea / community.git / commitdiff
| author | Julia Beliaeva <Julia.Beliaeva@jetbrains.com> | |
| Wed, 12 Aug 2020 14:41:10 +0000 (17:41 +0300) | ||
| committer | intellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com> | |
| Wed, 12 Aug 2020 20:52:12 +0000 (20:52 +0000) |
| plugins/git4idea/src/git4idea/index/actions/GitConflictActions.kt | [moved from plugins/git4idea/src/git4idea/index/actions/GitAcceptConflictSideAction.kt with 100% similarity] | patch | blob | history |