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() 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/"