From owner-cvs-src-old@FreeBSD.ORG  Mon Mar 23 14:54:07 2009
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 999CB106576B
	for <cvs-src-old@freebsd.org>; Mon, 23 Mar 2009 14:54:07 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A6DF8FC2B
	for <cvs-src-old@freebsd.org>; Mon, 23 Mar 2009 14:54:07 +0000 (UTC)
	(envelope-from dougb@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 n2NEs7Mj023449
	for <cvs-src-old@freebsd.org>; Mon, 23 Mar 2009 14:54:07 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2NEs7tq023448
	for cvs-src-old@freebsd.org; Mon, 23 Mar 2009 14:54:07 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200903231454.n2NEs7tq023448@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 23 Mar 2009 14:54:01 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_6
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 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: Mon, 23 Mar 2009 14:54:09 -0000

dougb       2009-03-23 14:54:01 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  SVN rev 190322 on 2009-03-23 14:54:01Z by dougb
  
  MFC 190320, don't expand example $FreeBSD strings
  
  Revision  Changes    Path
  1.32.2.6  +3 -3      src/usr.sbin/mergemaster/mergemaster.8
  1.51.8.8  +1 -1      src/usr.sbin/mergemaster/mergemaster.sh