New mergemaster option to install files that differ only by $FreeBSD

[Doug Barton]

This was already discussed on -stable recently, so I've committed the
change in order to get it MFCed prior to the 7.2 code freeze.

Would those of you who were concerned about this issue during the last
round of discussions please test this new option and report back?


Thanks,

Doug


-------- Original Message --------
Subject: svn commit: r189992 - head/usr.sbin/mergemaster
Date: Wed, 18 Mar 2009 21:51:12 +0000 (UTC)
From: Doug Barton <dougb at FreeBSD.org>
To: src-committers at freebsd.org, svn-src-all at freebsd.org,
svn-src-head at freebsd.org

Author: dougb
Date: Wed Mar 18 21:51:11 2009
New Revision: 189992
URL: http://svn.freebsd.org/changeset/base/189992

Log:
  Add a new -F option to automatically install files that differ
  only by version control Id strings

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh