K 10 svn:author V 4 rene K 8 svn:date V 27 2012-01-22T23:42:59.000000Z K 7 svn:log V 199 Remove instructions in case the -p option of mergemaster(8) is not present, it is in all supported releases. Idea taken from http://wiki.freebsd.org/DocIdeaList Reviewed by: bcr Approved by: dougb END