From owner-cvs-src-old@FreeBSD.ORG  Wed Dec 10 11:09:38 2008
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7AA801065759
	for <cvs-src-old@freebsd.org>; Wed, 10 Dec 2008 11:09:37 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D8238FC26
	for <cvs-src-old@freebsd.org>; Wed, 10 Dec 2008 11:09:37 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAB9bUj033496
	for <cvs-src-old@freebsd.org>; Wed, 10 Dec 2008 11:09:37 GMT
	(envelope-from sobomax@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAB9bOq033495
	for cvs-src-old@freebsd.org; Wed, 10 Dec 2008 11:09:37 GMT
	(envelope-from sobomax@repoman.freebsd.org)
Message-Id: <200812101109.mBAB9bOq033495@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	sobomax@repoman.freebsd.org using -f
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Wed, 10 Dec 2008 11:09:31 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_6
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 11:09:38 -0000

sobomax     2008-12-10 11:09:31 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 185856 on 2008-12-10 11:09:31Z by sobomax
  
  MFC: automatically upgrade files that only differ in CVS Id tag.
  
  Revision  Changes    Path
  1.51.8.5  +19 -0     src/usr.sbin/mergemaster/mergemaster.sh