From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Feb 2013 20:39:59 +0000 (-0800)
Subject: Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'
X-Git-Tag: v1.8.2-rc0~68
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/67d9c41c4a74619d81d9832efb25773126934852?ds=inline;hp=--cc

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
---

67d9c41c4a74619d81d9832efb25773126934852