mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Refs #32900 -- Restored '[y/N]' in questioner prompt when merging migrations.
Regression in 02bc7161ec
.
This commit is contained in:
parent
f2a28e11d9
commit
aa0d796e37
@ -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,
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user