From owner-freebsd-current Wed Jan 6 11:21:23 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA23989 for freebsd-current-outgoing; Wed, 6 Jan 1999 11:21:23 -0800 (PST) (envelope-from owner-freebsd-current@FreeBSD.ORG) Received: from schizo.cdsnet.net (schizo.cdsnet.net [204.118.244.32]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA23982 for ; Wed, 6 Jan 1999 11:21:21 -0800 (PST) (envelope-from mrcpu@internetcds.com) Received: from localhost (mrcpu@localhost) by schizo.cdsnet.net (8.8.8/8.7.3) with SMTP id LAA19801 for ; Wed, 6 Jan 1999 11:15:56 -0800 (PST) Date: Wed, 6 Jan 1999 11:15:46 -0800 (PST) From: Jaye Mathisen X-Sender: mrcpu@schizo.cdsnet.net To: current@FreeBSD.ORG Subject: mergemaster should be merged in to the main tree. Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG This utility is too valuable for all the update not to at least have a mention of it. At the very least, references should be made to it in /usr/src/Makefile as part of the conversion process, and inthe /usr/src/UPDATING file. I would be willing to get permission from the author if people think it's a good idea. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message