svn commit: r214123 - stable/8/bin/sh

[David O'Brien]

On Thu, Oct 21, 2010 at 10:51:16PM +0200, Jilles Tjoelker wrote:
> On Thu, Oct 21, 2010 at 01:13:41AM +0000, David E. O'Brien wrote:
> >   MFC
> >     r213925: use <stddef.h> rather than <sys/stddef.h>
> 
> Hmm, it looks like this was not merged except for adding the mergeinfo.

Hi Jilles,
You are correct.  Doing a merge of that results in a meaningless
situation as the base isn't there.conflict.  So I am blocking that
particular revision from being a merge candidate and that could be
merged in the future.

http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.advanced.blockchanges

-- 
-- David  (obrien at FreeBSD.org)