From owner-cvs-src@FreeBSD.ORG  Sat Jun 10 21:44:57 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 867B316A41B;
	Sat, 10 Jun 2006 21:44:57 +0000 (UTC)
	(envelope-from gordon@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 41D4743D6B;
	Sat, 10 Jun 2006 21:44:57 +0000 (GMT)
	(envelope-from gordon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5ALgnjq091826;
	Sat, 10 Jun 2006 21:42:49 GMT
	(envelope-from gordon@repoman.freebsd.org)
Received: (from gordon@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5ALgnkh091825;
	Sat, 10 Jun 2006 21:42:49 GMT (envelope-from gordon)
Message-Id: <200606102142.k5ALgnkh091825@repoman.freebsd.org>
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sat, 10 Jun 2006 21:42:49 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jun 2006 21:44:57 -0000

gordon      2006-06-10 21:42:49 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  MFC auto updating of files not modified by the user.
  
  Revision  Changes    Path
  1.32.2.3  +3 -1      src/usr.sbin/mergemaster/mergemaster.8
  1.51.8.3  +86 -1     src/usr.sbin/mergemaster/mergemaster.sh