summaryrefslogtreecommitdiff
path: root/tests/migrations/test_migrations_conflict
AgeCommit message (Expand)Author
2023-02-01Refs #33476 -- Applied Black's 2023 stable style.David Smith
2022-02-07Refs #33476 -- Reformatted code with Black.django-bot
2017-01-18Refs #23919 -- Removed encoding preambles and future importsClaude Paroz
2015-07-27Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey...Flavio Curella
2014-05-15Harmonized some PEP 0263 coding preamblesClaude Paroz
2014-04-13Fixed #22350 -- Consistently serialize bytes and text in migrations.Simon Charette
2013-12-04Migration VCS conflict detection and --merge for makemigrationsAndrew Godwin