Date: Tue, 25 Jul 1995 20:04:23 -0700 (PDT) From: "Rodney W. Grimes" <rgrimes@gndrsh.aac.dev.com> To: jkh@freefall.cdrom.com (Jordan K. Hubbard) Cc: CVS-commiters@freefall.cdrom.com, cvs-user@freefall.cdrom.com Subject: Re: cvs commit: src/release Makefile Message-ID: <199507260304.UAA23544@gndrsh.aac.dev.com> In-Reply-To: <199507251913.MAA08323@freefall.cdrom.com> from "Jordan K. Hubbard" at Jul 25, 95 12:13:21 pm
next in thread | previous in thread | raw e-mail | index | archive | help
> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199507260304.UAA23544>