Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:39:59 +0000 (12:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Feb 2013 20:39:59 +0000 (12:39 -0800)
commit67d9c41c4a74619d81d9832efb25773126934852
tree95cbba97d6aea8eba22349c8a2c31ee033551d9c
parent51a1d232a7c1bc6bbdb4ac47ab2e91ad3873b25b
parent1187ec99b93aefc3bfb6e360d285245745e1e390
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'

Warn people that other tools are more recommendable over
cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport
will not work with cvsps3.

* jk/cvsimport-does-not-work-with-cvsps3:
  git-cvsimport.txt: cvsps-2 is deprecated
Documentation/git-cvsimport.txt