Re: Emacs antialiasing in X

[Jan D.]

> "Jan D." <address@hidden> writes:
> 
> >> Are you telling me that edits made to ChangeLog, NEWS, etc., in the
> >> XFT branch are expendable?
> >
> > Yes, because those files have not been changed.  
> 
> 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?

One would think so.  However, when I merge stuff from HEAD to the XFT
branch, I get conflicts in files I know I have not modified.  Probably some
merge expert can explain why that happens.

        Jan D.