diff options
| author | Seonghyeon Cho <seonghyeoncho96@gmail.com> | 2021-10-09 23:53:27 +0900 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-10-11 09:40:06 +0200 |
| commit | 1aada25eeb8debabe5e1a50d64843b085a95237b (patch) | |
| tree | 04baf89c5e749db6db1955a7eb8438894223b073 /django | |
| parent | fe97f8bb6259634f8c490b8204d8b5594d414855 (diff) | |
[4.0.x] Refs #32900 -- Restored '[y/N]' in questioner prompt when merging migrations.
Regression in 02bc7161ec477afd4a7b328936eb8adac078d7b9.
Backport of aa0d796e37c4b8056148de2f68726aae9d20399c from main
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/migrations/questioner.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py index 3891616ce0..31973a11b6 100644 --- 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, ) |