[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Emacs antialiasing in X

From: Jan D.
Subject: Re: Emacs antialiasing in X
Date: Mon, 16 Jan 2006 14:53:35 +0100 (CET)

> "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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]