summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.7.7.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/releases/1.7.7.txt b/docs/releases/1.7.7.txt
index 1c6b9325f4..8b4ae1575d 100644
--- a/docs/releases/1.7.7.txt
+++ b/docs/releases/1.7.7.txt
@@ -12,3 +12,7 @@ Bugfixes
* Fixed renaming of classes in migrations where renaming a subclass would
cause incorrect state to be recorded for objects that referenced the
superclass (:ticket:`24354`).
+
+* Stopped writing migration files in dry run mode when merging migration
+ conflicts. When ``makemigrations --merge`` is called with ``verbosity=3`` the
+ migration file is written to ``stdout`` (:ticket: `24427`).