I have some other changes planned so I'm not going to re-roll the port yet, but between now and then I've put up a version of mergemaster that knows about the $FreeBSD tags at http://freebsd.simplenet.com/mergemaster-1.25. Enjoy, Doug To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-current" in the body of the message