[4.0.x] Refs #32900 -- Restored '[y/N]' in questioner prompt when merging migrations.

Regression in 02bc7161ec. Backport of aa0d796e37 from main
2021-10-09 23:53:27 +09:00 · 2021-10-09 23:53:27 +09:00 · 1aada25eeb
parent fe97f8bb62
commit 1aada25eeb
1 changed files with 1 additions and 1 deletions
--- a/django/db/migrations/questioner.py
+++ b/django/db/migrations/questioner.py
@ -205,7 +205,7 @@ class InteractiveMigrationQuestioner(MigrationQuestioner):
        return self._boolean_input(
            "\nMerging will only work if the operations printed above do not conflict\n" +
            "with each other (working on different fields or models)\n" +
-            'Should these migration branches be merged?',
+            'Should these migration branches be merged? [y/N]',
            False,
        )