summaryrefslogtreecommitdiff
path: root/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict
ModeNameSize
-rw-r--r--CmdConflictClient.java1534logplain
-rw-r--r--ConflictAction.java1922logplain
-rw-r--r--ConflictClient.java532logplain
-rw-r--r--ConflictOperation.java1109logplain
-rw-r--r--ConflictReason.java2189logplain
-rw-r--r--ConflictVersion.java2524logplain
-rw-r--r--SvnKitConflictClient.java1017logplain
-rw-r--r--TreeConflictDescription.java3740logplain