svn commit: r259326 - stable/10/contrib/tcpdump

Fri Dec 13 19:43:32 UTC 2013

On Fri, Dec 13, 2013 at 2:32 PM, Pedro F. Giffuni <pfg at freebsd.org> wrote:
> Author: pfg
> Date: Fri Dec 13 19:32:02 2013
> New Revision: 259326
> URL: http://svnweb.freebsd.org/changeset/base/259326
>
> Log:
>   MFV r258571:
>
>   Removes strict-aliasing warnings from newer GCC in tcpdump.
>
>   Corresponds to MFC r258573, but for some reason our new pre-commit hooks
>   will not let us merge it from there.

How did you attempt to do this merge?  What were the exact commands?