From owner-cvs-src-old@FreeBSD.ORG  Sat Dec 19 01:30:59 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 187151065697
	for <cvs-src-old@freebsd.org>; Sat, 19 Dec 2009 01:30:59 +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 DFBED8FC1A
	for <cvs-src-old@freebsd.org>; Sat, 19 Dec 2009 01:30:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJ1Uw6R094622
	for <cvs-src-old@freebsd.org>; Sat, 19 Dec 2009 01:30:58 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBJ1Uw0Y094621
	for cvs-src-old@freebsd.org; Sat, 19 Dec 2009 01:30:58 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200912190130.nBJ1Uw0Y094621@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: Sat, 19 Dec 2009 01:30:45 +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: Sat, 19 Dec 2009 01:30:59 -0000

dougb       2009-12-19 01:30:45 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  SVN rev 200700 on 2009-12-19 01:30:45Z by dougb
  
  In the places where find is used that the user may see the results,
  first pipe it to sort so that order of processing will be deterministic
  and like things will be grouped together.
  
  Revision  Changes    Path
  1.75      +3 -3      src/usr.sbin/mergemaster/mergemaster.sh