svn commit: r254966 - stable/9/usr.sbin

[Glen Barber]

On Tue, Aug 27, 2013 at 06:16:50PM +0000, Devin Teske wrote:
> Author: dteske
> Date: Tue Aug 27 18:16:50 2013
> New Revision: 254966
> URL: http://svnweb.freebsd.org/changeset/base/254966
> 
> Log:
>   Add missing mergeinfo from head for stabe/9 revisions: 252995 253168 253169
> 
> Modified:
> Directory Properties:
>   stable/9/usr.sbin/   (props changed)
>   stable/9/usr.sbin/Makefile   (props changed)
>   stable/9/usr.sbin/bsdconfig/   (props changed)

This is wrong.  usr.sbin should never be a merge target.  The correct
merge targets in this case are usr.sbin/bsdconfig/share and
usr.sbin/bsdconfig.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-stable-9/attachments/20130827/cbc89c25/attachment.sig>