bin/169685: freebsd-update's merge procedure should automate certain diff partterns

[crees at FreeBSD.org]

Synopsis: freebsd-update's merge procedure should automate certain diff partterns

Responsible-Changed-From-To: freebsd-ports-bugs->cperciva
Responsible-Changed-By: crees
Responsible-Changed-When: Fri Jul 6 19:15:32 UTC 2012
Responsible-Changed-Why: 
Assign responsible

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