Synopsis: Fix mergemaster(8) to be upgrade-friendly Responsible-Changed-From-To: freebsd-bugs->dougb Responsible-Changed-By: linimon Responsible-Changed-When: Sat Apr 29 22:52:22 UTC 2006 Responsible-Changed-Why: Over to maintainer. http://www.freebsd.org/cgi/query-pr.cgi?pr=96528