From owner-cvs-src-old@FreeBSD.ORG  Sun Nov  9 23:44:43 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 00CDC1065765
	for <cvs-src-old@freebsd.org>; Sun,  9 Nov 2008 23:44:38 +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 2DABE8FC19
	for <cvs-src-old@freebsd.org>; Sun,  9 Nov 2008 23:44:38 +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 mA9NicUG098767
	for <cvs-src-old@freebsd.org>; Sun, 9 Nov 2008 23:44:38 GMT
	(envelope-from sobomax@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA9NicmB098766
	for cvs-src-old@freebsd.org; Sun, 9 Nov 2008 23:44:38 GMT
	(envelope-from sobomax@repoman.freebsd.org)
Message-Id: <200811092344.mA9NicmB098766@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: Sun, 9 Nov 2008 23:44:32 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
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: Sun, 09 Nov 2008 23:44:43 -0000

sobomax     2008-11-09 23:44:32 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 184804 on 2008-11-09 23:44:32Z by sobomax
  
  Improve on 184781 - instead of ignoring the file when the only difference
  is CVS Id, replace the old one with the new one automatically. While I
  don't see much difference, some people think it's somehow better that way.
  
  Revision  Changes    Path
  1.58      +8 -2      src/usr.sbin/mergemaster/mergemaster.sh