Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint
commit3d00a5c148ee5611fc21de6d20f5f82602a75c5f
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:22 +0000 (4 10:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:23 +0000 (4 10:04 -0800)
tree6231779249bf4f67f20752e7ac52b499d1975d7d
parent61947de909ae1fa6112a58a812c6202cd02d3549
parent1187ec99b93aefc3bfb6e360d285245745e1e390
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint

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