[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
[idea/community.git] / images / test /
drwxr-xr-x   ..
drwxr-xr-x - org