Date: Thu, 07 Jun 2012 11:23:38 -0700 From: "Thomas D. Dean" <tomdean@speakeasy.org> To: freebsd-stable@freebsd.org Subject: Re: Mergemaster Fails Message-ID: <4FD0F1AA.80906@speakeasy.org> In-Reply-To: <20120607175512.GB30509@isuckatdomains.isuckatdomains.net> References: <4FCFECFF.9070504@speakeasy.org> <20120607042008.GA30509@isuckatdomains.isuckatdomains.net> <4FD0DF54.10704@speakeasy.org> <20120607175512.GB30509@isuckatdomains.isuckatdomains.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 06/07/12 10:55, Chris Nehren wrote: > On Thu, Jun 07, 2012 at 10:05:24 -0700 , Thomas D. Dean wrote: > It looks like there's a pager (probably less) that's waiting for you to > respond. The output suggests it's showing you the results of diffing an > old file with a new one--could be either /etc/devd.conf or > /etc/usb.conf. > This is obvious, but, what is causing the hang. I get it from the console as well as in an xterm. Tom Dean
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FD0F1AA.80906>