Merge branch 'en/fast-import-merge-doc'

Doc update.

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

diff --cc Documentation/git-fast-import.txt
index fad327a,28b447a..0bb2762
--- 1/Documentation/git-fast-import.txt
--- 2/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -388,10 -388,9 +388,10 @@@ change to the project
        original-oid?
        ('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
        'committer' (SP <name>)? SP LT <email> GT SP <when> LF
 +      ('encoding' SP <encoding>)?
        data
        ('from' SP <commit-ish> LF)?
-       ('merge' SP <commit-ish> LF)?
+       ('merge' SP <commit-ish> LF)*
        (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
        LF?
  ....