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

[Andreas Tobler]

Doug Barton wrote:
> 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?

An understanding question here, should this also work when upgrading 
from cvs based install to an svn based install?

Or does this only work when the cvs version differs?

I'm updating right now a 7.1 install on ppc to a current, svn based 
build, from today.

This is what I get here:

----
  *** Displaying differences between ./etc/pam.d/ftpd and installed version:

--- /etc/pam.d/ftpd     2009-01-03 23:32:10.000000000 +0100
+++ ./etc/pam.d/ftpd    2009-03-25 22:00:53.000000000 +0100
@@ -1,5 +1,5 @@
  #
-# $FreeBSD: src/etc/pam.d/ftpd,v 1.19.6.1 2008/11/25 02:59:29 kensmith 
Exp $
+# $FreeBSD$
  #
  # PAM configuration for the "ftpd" service
  #

   Use 'd' to delete the temporary ./etc/pam.d/ftpd
   Use 'i' to install the temporary ./etc/pam.d/ftpd
   Use 'm' to merge the temporary and installed versions
   Use 'v' to view the diff results again
----


TIA,
Andreas