git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 57027b448f52a1357d89b569f5b94c8a928f7f56..b0c6d7c30323c775f49dc65b3895855eed0f4e19 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -99,21 +99,24 @@ If you need to pass multiple options, separate them with a comma.
        CVS by default uses the unix username when writing its
        commit logs. Using this option and an author-conv-file
        in this format
-
++
+---------
        exon=Andreas Ericsson <ae@op5.se>
        spawn=Simon Pawn <spawn@frog-pond.org>
 
-       git-cvsimport will make it appear as those authors had
-       their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
-       all along.
-
-       For convenience, this data is saved to $GIT_DIR/cvs-authors
-       each time the -A option is provided and read from that same
-       file each time git-cvsimport is run.
-
-       It is not recommended to use this feature if you intend to
-       export changes back to CVS again later with
-       git-link[1]::git-cvsexportcommit.
+---------
++
+git-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along.
++
+For convenience, this data is saved to $GIT_DIR/cvs-authors
+each time the -A option is provided and read from that same
+file each time git-cvsimport is run.
++
+It is not recommended to use this feature if you intend to
+export changes back to CVS again later with
+git-link[1]::git-cvsexportcommit.
 
 OUTPUT
 ------