From owner-cvs-contrib  Sun Jun 22 04:00:20 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id EAA26633
          for cvs-contrib-outgoing; Sun, 22 Jun 1997 04:00:20 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA26608;
          Sun, 22 Jun 1997 04:00:06 -0700 (PDT)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id DAA13795;
	Sun, 22 Jun 1997 03:59:26 -0700 (PDT)
Date: Sun, 22 Jun 1997 03:59:26 -0700 (PDT)
Message-Id: <199706221059.DAA13795@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/cvs/src cvs.h import.c lock.c main.c
         mkmodules.c rcs.c rcs.h server.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1997/06/22 03:59:26 PDT

  Modified files:
    contrib/cvs/src      cvs.h import.c lock.c main.c mkmodules.c 
                         rcs.c rcs.h server.c 
  Log:
  merge conflicts
  
  Revision  Changes    Path
  1.5       +6 -0      src/contrib/cvs/src/cvs.h
  1.3       +107 -35   src/contrib/cvs/src/import.c
  1.4       +1 -1      src/contrib/cvs/src/lock.c
  1.9       +16 -4     src/contrib/cvs/src/main.c
  1.4       +14 -10    src/contrib/cvs/src/mkmodules.c
  1.9       +10 -2     src/contrib/cvs/src/rcs.c
  1.3       +4 -0      src/contrib/cvs/src/rcs.h
  1.4       +46 -1     src/contrib/cvs/src/server.c