From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2013 18:04:22 +0000 (-0800)
Subject: Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint
X-Git-Tag: v1.8.1.3~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d00a5c148ee5611fc21de6d20f5f82602a75c5f?ds=inline;hp=--cc

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

3d00a5c148ee5611fc21de6d20f5f82602a75c5f