Date: Mon, 8 Mar 2021 12:05:37 -0600 From: Kyle Evans <kevans@freebsd.org> To: Mark Johnston <markj@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 1bb7c45c532f - main - wg: Fix a mismerge Message-ID: <CACNAnaHwD=%2BOQyMg7umYLoWjiKqBnRGuRt5oDpOrLxgstTnB3g@mail.gmail.com> In-Reply-To: <202103081758.128Hw05O070057@gitrepo.freebsd.org> References: <202103081758.128Hw05O070057@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 8, 2021 at 11:58 AM Mark Johnston <markj@freebsd.org> wrote: > > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1bb7c45c532f3de76120db05739ac4ee34403091 > > commit 1bb7c45c532f3de76120db05739ac4ee34403091 > Author: Mark Johnston <markj@FreeBSD.org> > AuthorDate: 2021-03-08 17:56:14 +0000 > Commit: Mark Johnston <markj@FreeBSD.org> > CommitDate: 2021-03-08 17:56:14 +0000 > > wg: Fix a mismerge > > df55485085 fixed a leak that I had initially fixed in a11009dccb. > > Fixes: a11009dccb Whoops, sorry about that. :-( I didn't check for conflicting work here.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaHwD=%2BOQyMg7umYLoWjiKqBnRGuRt5oDpOrLxgstTnB3g>