On 01/28/2013 13:59, David Demelier wrote:
What did you have in your mergemaster.rc ? To help next people who may have the
same problem :)
The mergemaster.rc that caused the problem has this
IGNORE_FILES='/etc/group /etc/hosts.allow /etc/mail/* /etc/master.passwd
/etc/motd /etc/passwd /etc/sy
What did you have in your mergemaster.rc ? To help next people who may have
the same problem :)
2013/1/28 Michiel Boland
> 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 corn
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://
On Sun, Jan 27, 2013 at 11:18 AM, Michiel Boland wrote:
> # mergemaster -p
>
> *** Creating the temporary root environment in /var/tmp/temproot
> *** /var/tmp/temproot ready for use
> *** Creating and populating directory structure in /var/tmp/temproot
>
>
>
> *** Beginning comparison
>
>
> ***
