MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-286271 git: fix branch list parsing in "Git Merge" dialog

Browse Source 
GitOrigin-RevId: f0c58e85ee6ae192fcfd7f3bfc9cb3163e2929d5
This commit is contained in:
Aleksey Pivovarov
2022-01-12 15:51:18 +00:00
committed by intellij-monorepo-bot
parent 3cbf603509
commit feac6cfa02
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+1 -1
View File
@@ -425,7 +425,7 @@ class GitMergeDialog(private val project: Project,
companion object {
private val LOG = logger<GitMergeDialog>()
private val LINK_REF_REGEX = Pattern.compile(".+\\s->\\s.+")
private val BRANCH_NAME_REGEX = Pattern.compile(". (.+\\s*)")
private val BRANCH_NAME_REGEX = Pattern.compile(". (\\S+)\\s*")
@NlsSafe
private const val REMOTE_REF = "remotes/"