From owner-cvs-contrib  Fri May 23 08:59:56 1997
Return-Path: <owner-cvs-contrib>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id IAA26512
          for cvs-contrib-outgoing; Fri, 23 May 1997 08:59:56 -0700 (PDT)
Received: from agora.rdrop.com (root@agora.rdrop.com [199.2.210.241])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id IAA26503;
          Fri, 23 May 1997 08:59:48 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
	by agora.rdrop.com (8.8.5/8.8.5) with ESMTP id HAA11806;
	Fri, 23 May 1997 07:52:40 -0700 (PDT)
From: peter@FreeBSD.ORG
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id HAA17083;
	Fri, 23 May 1997 07:52:35 -0700 (PDT)
Date: Fri, 23 May 1997 07:52:35 -0700 (PDT)
Message-Id: <199705231452.HAA17083@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/cvs/src diff.c main.c rcs.c
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1997/05/23 07:52:35 PDT

  Modified files:
    contrib/cvs/src      diff.c main.c rcs.c 
  Log:
  Merge conflicts from 970523 import
  
  Revision  Changes    Path
  1.6       +1 -1      src/contrib/cvs/src/diff.c
  1.8       +27 -10    src/contrib/cvs/src/main.c
  1.7       +2 -0      src/contrib/cvs/src/rcs.c