What did you have in your mergemaster.rc ? To help next people who may have the same problem :)
2013/1/28 Michiel Boland <bolan...@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-unsubscr...@freebsd.org> > " > -- Demelier David _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
