Cherry-pick of 3e96ade has failed:

On branch mergify/bp/stable/1.4/pr-14278
Your branch is up to date with 'origin/stable/1.4'.

You are currently cherry-picking commit 3e96ade54.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   qiskit/visualization/circuit/text.py
	new file:   releasenotes/notes/draw-control-flow-end-ceb58ed2c46ff758.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/python/visualization/test_circuit_text_drawer.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the following people are relevant to this code:

• @enavarro51
• @Qiskit/terra-core