[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
[idea/community.git] / bin /
drwxr-xr-x   ..
drwxr-xr-x - WinLauncher
-rw-r--r-- 10331 idea.properties
drwxr-xr-x - linux
-rw-r--r-- 2652 log.xml
drwxr-xr-x - mac
drwxr-xr-x - win