django/django — pull request #2708 by mmardini (2014-05-24 17:32:08+00:00)
Title: Fixed #22692 -- Added docs for `makemigrations` two command options.

Added documentation about `--dry-run` and `--merge`.