[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Emacs antialiasing in X
From: |
Stefan Monnier |
Subject: |
Re: Emacs antialiasing in X |
Date: |
Mon, 16 Jan 2006 11:51:11 -0500 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
> 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.
Stefan
- Re: Emacs antialiasing in X, (continued)
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/16
- Re: Emacs antialiasing in X, Jan D., 2006/01/16
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/16
- Re: Emacs antialiasing in X, Miles Bader, 2006/01/16
- Re: Emacs antialiasing in X, Jan D., 2006/01/17
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/17
- Re: Emacs antialiasing in X, Miles Bader, 2006/01/17
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/19
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/28
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/17
- Re: Emacs antialiasing in X,
Stefan Monnier <=
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/16
- Re: Emacs antialiasing in X, Emfox Zhou, 2006/01/16
- Re: Emacs antialiasing in X, Stefan Monnier, 2006/01/15
- Re: Emacs antialiasing in X, David Abrahams, 2006/01/16
- Re: Emacs antialiasing in X, YAMAMOTO Mitsuharu, 2006/01/16
- Re: Emacs antialiasing in X, Jan Djärv, 2006/01/15