Re: Emacs antialiasing in X

[David Abrahams]

Stefan Monnier <address@hidden> writes:

>> I don't mean to be difficult, but I think "CVS merge" disagrees with
>> you.  If they had not been changed at all, wouldn't it leave them
>> untouched when I merge the XFT branch into the unicode-2 branch?
>
> It's probably just spurious conflicts due to repeated merging.  CVS is
> notoriously bad at keeping track of what has already been merged.
>
> Better work from the Arch branches managed by Miles when you need to merge.
                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Wow, even more confusing.  The above is meaningless to me.  Can you explain?

Thanks,
-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com