Mercurial Repositories > Django Project / file diff

diff -r 5c925935cbb9 -r d280acf98fb5 ProjectDjango/DjangoMakeMigrationsDialog.py
--- a/ProjectDjango/DjangoMakeMigrationsDialog.py	Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/DjangoMakeMigrationsDialog.py	Sat Mar 24 19:11:39 2018 +0100
@@ -37,12 +37,14 @@
         Public method to get the data for the migration.
         
         @return tuple containing the application names, a migration name,
-            the dry-run flag and a flag for an empty migration
-        @rtype tuple of (str, str, bool, bool)
+            the dry-run flag, a flag for an empty migration and a flag
+            indicating to fix migration conflicts
+        @rtype tuple of (str, str, bool, bool, bool)
         """
         return (
             self.applicationsComboBox.currentText(),
             self.nameEdit.text(),
             self.dryrunCheckBox.isChecked(),
             self.emptyCheckBox.isChecked(),
+            self.mergeCheckBox.isChecked(),
         )