Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Jan 2013 13:59:30 +0100
From:      David Demelier <demelier.david@gmail.com>
To:        Michiel Boland <boland37@xs4all.nl>
Cc:        FreeBSD Stable <freebsd-stable@freebsd.org>
Subject:   Re: mergemaster -p / installkernel problem
Message-ID:  <CAO%2BPfDdxfrS2P5hmEwtrPuAPi9r%2BSiJaz_p7KSx3A0_Rb4St2Q@mail.gmail.com>
In-Reply-To: <51062FBF.10507@xs4all.nl>
References:  <51057DA1.2090408@xs4all.nl> <CAN6yY1sPz%2BBH9O3dnyiH3Mv%2Bu27BLuhkvbPdR7LSCmb9j=VkRg@mail.gmail.com> <51062FBF.10507@xs4all.nl>

next in thread | previous in thread | raw e-mail | index | archive | help
What did you have in your mergemaster.rc ? To help next people who may have
the same problem :)


2013/1/28 Michiel Boland <boland37@xs4all.nl>

> On 01/28/2013 02:10, Kevin Oberman wrote:
>
>> You don't by any chance have a mergemaster.rc in /etc or
>> .mergemasterrc in $HOME?
>>
>>
> Duh... I'll go stand in the corner for the next 37 years.
>
> Cheers
> Michiel
>
>
> ______________________________**_________________
> freebsd-stable@freebsd.org mailing list
> http://lists.freebsd.org/**mailman/listinfo/freebsd-**stable<http://lists.freebsd.org/mailman/listinfo/freebsd-stable>;
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe@**freebsd.org<freebsd-stable-unsubscribe@freebsd.org>
> "
>



-- 
Demelier David



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAO%2BPfDdxfrS2P5hmEwtrPuAPi9r%2BSiJaz_p7KSx3A0_Rb4St2Q>