On 03/11/10 19:18, Steve Bertrand wrote:
> On 2010.03.11 22:14, Xin LI wrote:
>> Looks like you have a stale configuration. DId you done mergemaster?
>
> Yes. I performed it as such:
>
> # mergemaster -Uia
The -a option is incompatible with -U AND -i (and -F for that matter).
However, it's my mistake that this issue has never previously been
addressed in the code. I just committed a fix for this, which I'll MFC
ASAP.
hth,
Doug
--
... and that's just a little bit of history repeating.
-- Propellerheads
Improve the effectiveness of your Internet presence with
a domain name makeover! http://SupersetSolutions.com/
_______________________________________________
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"
