Date: Fri, 09 Jan 2009 19:47:37 -0800 From: Doug Barton <dougb@FreeBSD.org> To: Mike Lempriere <mike@vintners.net> Cc: Andrei Kolu <antik@bsd.ee>, freebsd-stable@FreeBSD.ORG, freebsd@byshenk.net Subject: Re: mergemaster broken -- take 2 Message-ID: <49681A59.20002@FreeBSD.org> In-Reply-To: <496819F0.9@vintners.net> References: <200901081047.n08Alg2h000825@lurza.secnetix.de> <496819F0.9@vintners.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Mike Lempriere wrote:
> Thanks everyone for the advice -- I got it working this time just fine.
> Works much better when one follows the directions accurately instead of
> by memory.
W00t!
:)
--
This .signature sanitized for your protection
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49681A59.20002>