summaryrefslogtreecommitdiff
path: root/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict
ModeNameSize
-rw-r--r--ApplyPatchSaveToFileExecutor.java5649logplain
-rw-r--r--MergeFromTheirsResolver.java25678logplain
-rw-r--r--SvnTreeConflictResolver.java6365logplain
-rw-r--r--TreeConflictDetailsProvider.java1802logplain
-rw-r--r--TreeConflictRefreshablePanel.java23035logplain