MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

refactor [vcs-merge]: reorder fields

Browse Source 
GitOrigin-RevId: 1d3a3d44115ea03dc07fb6c3ee244e3be6ad566c
This commit is contained in:
Ivan Semenov
2026-02-04 13:09:32 +01:00
committed by intellij-monorepo-bot
parent e32026b9e5
commit c2e46dff1f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
View File

@@ -90,11 +90,11 @@ open class MultipleFileMergeDialog(
private var unresolvedFiles = files.toMutableList()
private val mergeSession = (mergeProvider as? MergeProvider2)?.createMergeSession(files)
val processedFiles: MutableList<VirtualFile> = mutableListOf()
private val table: TreeTable
private lateinit var acceptYoursButton: JButton
private lateinit var acceptTheirsButton: JButton
private lateinit var mergeButton: JButton
private val tableModel = ListTreeTableModelOnColumns(DefaultMutableTreeNode(), createColumns())
private val table: TreeTable
private lateinit var descriptionLabel: JEditorPane