[git-index] add "Merge" action to the context menu
[idea/community.git] / plugins / git4idea / src / git4idea / index / actions / GitAcceptConflictSideAction.kt
2020-08-12 Julia Beliaeva[git-index] add "Merge" action to the context menu
2020-08-05 Julia Beliaeva[git-index] add accept theirs/yours actions to the...