bin/88629: mergemaster -i should replace files that only change $FreeBSD$

[Mark Linimon]

Synopsis: mergemaster -i should replace files that only change $FreeBSD$

Responsible-Changed-From-To: freebsd-bugs->dougb
Responsible-Changed-By: linimon
Responsible-Changed-When: Tue Nov 8 00:21:51 GMT 2005
Responsible-Changed-Why: 
Over to mergemaster maintainer for evaluation.

http://www.freebsd.org/cgi/query-pr.cgi?pr=88629