From: "Jan D." <jan.h.d@swipnet.se>
Cc: emacs-devel@gnu.org, Kenichi Handa <handa@m17n.org>
Subject: Re: Emacs antialiasing in X
Date: Mon, 16 Jan 2006 14:53:35 +0100 (CET) [thread overview]
Message-ID: <200601161353.k0GDrZBx010466@coolsville.localdomain> (raw)
In-Reply-To: <87slrocmxi.fsf@boost-consulting.com> "from David Abrahams at Jan 16, 2006 08:38:49 am"
> "Jan D." <jan.h.d@swipnet.se> 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.
next prev parent reply other threads:[~2006-01-16 13:53 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-08 14:34 Emacs antialiasing in X Bill Atkins
2005-08-09 14:35 ` Jan D.
2005-12-20 20:17 ` David Abrahams
2005-12-21 5:30 ` Richard M. Stallman
2005-12-21 13:17 ` David Abrahams
2005-12-22 9:38 ` Jan D.
2006-01-12 22:56 ` David Abrahams
2006-01-13 8:49 ` Jan D.
2006-01-13 21:32 ` David Abrahams
2006-01-14 18:15 ` David Abrahams
2006-01-15 3:53 ` Emfox Zhou
2006-01-15 8:31 ` Jan Djärv
2006-01-15 16:13 ` David Abrahams
2006-01-16 0:58 ` Kenichi Handa
2006-01-16 2:09 ` David Abrahams
2006-01-16 2:35 ` Kenichi Handa
2006-01-16 3:02 ` David Abrahams
2006-01-16 4:07 ` Kenichi Handa
2006-01-16 13:32 ` David Abrahams
2006-01-16 23:45 ` Lőrentey Károly
2006-01-16 8:14 ` Jan D.
2006-01-16 9:45 ` Miles Bader
2006-01-16 13:38 ` David Abrahams
2006-01-16 13:53 ` Jan D. [this message]
2006-01-16 16:31 ` David Abrahams
2006-01-16 19:04 ` Jan D.
2006-01-16 20:17 ` David Abrahams
2006-01-16 22:48 ` Miles Bader
2006-01-17 8:34 ` Jan D.
2006-01-17 15:20 ` David Abrahams
2006-01-18 0:41 ` Miles Bader
2006-01-20 1:51 ` David Abrahams
2006-01-28 13:23 ` David Abrahams
2006-01-17 15:19 ` David Abrahams
2006-01-16 16:51 ` Stefan Monnier
2006-01-16 18:01 ` David Abrahams
2006-01-16 15:57 ` Emfox Zhou
2006-01-16 4:28 ` Stefan Monnier
2006-01-16 13:32 ` David Abrahams
2006-01-16 8:52 ` YAMAMOTO Mitsuharu
2006-01-15 8:28 ` Jan Djärv
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200601161353.k0GDrZBx010466@coolsville.localdomain \
--to=jan.h.d@swipnet.se \
--cc=emacs-devel@gnu.org \
--cc=handa@m17n.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.