From owner-cvs-contrib  Thu May 15 15:53:57 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id PAA22793
          for cvs-contrib-outgoing; Thu, 15 May 1997 15:53:57 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id PAA22759;
          Thu, 15 May 1997 15:53:40 -0700 (PDT)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id PAA24021;
	Thu, 15 May 1997 15:52:26 -0700 (PDT)
Date: Thu, 15 May 1997 15:52:26 -0700 (PDT)
Message-Id: <199705152252.PAA24021@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG,
        cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/cvs/man cvs.1 src/contrib/cvs/src diff.c
         main.c mkmodules.c rcs.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1997/05/15 15:52:26 PDT

  Modified files:
    contrib/cvs/man cvs.1 
  Log:
  Merge conflicts
  
  Revision  Changes    Path
  1.6       +22 -32    src/contrib/cvs/man/cvs.1

  Modified files:
    contrib/cvs/src diff.c main.c mkmodules.c rcs.c 
  Log:
  Merge import conflicts
  
  Revision  Changes    Path
  1.4       +453 -169  src/contrib/cvs/src/diff.c
  1.3       +547 -453  src/contrib/cvs/src/main.c
  1.3       +152 -81   src/contrib/cvs/src/mkmodules.c
  1.3       +2443 -439 src/contrib/cvs/src/rcs.c