summaryrefslogtreecommitdiff
path: root/tests/migrations/test_migrations_conflict/__init__.py
AgeCommit message (Expand)Author
2013-12-04Migration VCS conflict detection and --merge for makemigrationsAndrew Godwin