Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 6 Jan 2004 10:06:38 -0800 (PST)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   cvs commit: src/usr.sbin/mergemaster mergemaster.sh
Message-ID:  <200401061806.i06I6cOr060006@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
dougb       2004/01/06 10:06:38 PST

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5_2)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Commit the fix from 1.49 which prevents false positives in the
  -p (pre-world) case
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.47.2.2  +4 -5      src/usr.sbin/mergemaster/mergemaster.sh

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401061806.i06I6cOr060006>