Date: Fri, 28 Nov 2003 18:14:37 -0800 From: Sam Leffler <sam@errno.com> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/contrib/dev/ath - Imported sources Message-ID: <200311281814.37811.sam@errno.com> In-Reply-To: <200311290111.hAT1BnTB064982@repoman.freebsd.org> References: <200311290111.hAT1BnTB064982@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday 28 November 2003 05:11 pm, Sam Leffler wrote: > 1 conflicts created by this import. > Use the following command to help the merge: > > cvs checkout -jATHEROS:yesterday -jATHEROS src/sys/contrib/dev/ath For those that care, this was resolved by some repo magic. The conflict was due to a versioning problem that occurred when I initially committed this stuff. Sam
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311281814.37811.sam>