Merge branch 'en/fast-import-merge-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:12 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:12 +0000 (12:34 -0700)
Doc update.

* en/fast-import-merge-doc:
git-fast-import.txt: clarify that multiple merge commits are allowed

No differences found