From owner-cvs-user  Tue Jul 25 20:04:40 1995
Return-Path: cvs-user-owner
Received: (from majordom@localhost)
          by freefall.cdrom.com (8.6.11/8.6.6) id UAA00279
          for cvs-user-outgoing; Tue, 25 Jul 1995 20:04:40 -0700
Received: from gndrsh.aac.dev.com (gndrsh.aac.dev.com [198.145.92.241])
          by freefall.cdrom.com (8.6.11/8.6.6) with ESMTP id UAA00254
          ; Tue, 25 Jul 1995 20:04:30 -0700
Received: (from rgrimes@localhost) by gndrsh.aac.dev.com (8.6.11/8.6.9) id UAA23544; Tue, 25 Jul 1995 20:04:24 -0700
From: "Rodney W. Grimes" <rgrimes@gndrsh.aac.dev.com>
Message-Id: <199507260304.UAA23544@gndrsh.aac.dev.com>
Subject: Re: cvs commit: src/release Makefile
To: jkh@freefall.cdrom.com (Jordan K. Hubbard)
Date: Tue, 25 Jul 1995 20:04:23 -0700 (PDT)
Cc: CVS-commiters@freefall.cdrom.com, cvs-user@freefall.cdrom.com
In-Reply-To: <199507251913.MAA08323@freefall.cdrom.com> from "Jordan K. Hubbard" at Jul 25, 95 12:13:21 pm
X-Mailer: ELM [version 2.4 PL24]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Length: 606       
Sender: cvs-user-owner@freebsd.org
Precedence: bulk

> 
> jkh         95/07/25 12:13:21
> 
>   Modified:    release   Makefile
>   Log:
>   Sync this again with Mark M's changes so that he and I can diagnose
>   the common problems.

I thought that we had agreed that src/release would only be worked on in
_one_ branch until 2.1 src/release was done and working to your satisfaction
and I had merged the changes back into 2.2.

This has just created a merge conflict that will have to be delt with :-(.

-- 
Rod Grimes                                      rgrimes@gndrsh.aac.dev.com
Accurate Automation Company                 Reliable computers for FreeBSD