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:04:09 +0200 |
| commit | aa0d796e37c4b8056148de2f68726aae9d20399c (patch) | |
| tree | babe812cbe78fdd0310085d286a6a012ebd7402f | |
| parent | f2a28e11d910f2aba67f62ad2d7870d24b4ce24b (diff) | |
Refs #32900 -- Restored '[y/N]' in questioner prompt when merging migrations.
Regression in 02bc7161ec477afd4a7b328936eb8adac078d7b9.
| -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 349e35130e..9284e6be41 100644 --- a/django/db/migrations/questioner.py +++ b/django/db/migrations/questioner.py @@ -211,7 +211,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, ) |