From feac6cfa02cf694881b18d9a6227ea492a5bb0d4 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 12 Jan 2022 16:33:34 +0300
Subject: [PATCH] IDEA-286271 git: fix branch list parsing in "Git Merge"
 dialog

GitOrigin-RevId: f0c58e85ee6ae192fcfd7f3bfc9cb3163e2929d5
---
 plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
index 36c6030303ff..eb0bca24c91c 100644
--- a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.kt
@@ -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/"