From: "Jan Djärv" <jan.h.d@swipnet.se>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: ns merge conflicts
Date: Sat, 1 Nov 2014 21:07:11 +0100 [thread overview]
Message-ID: <7763292D-46F9-4FB3-A283-E431F1BEA067@swipnet.se> (raw)
In-Reply-To: <hca94ayeud.fsf@fencepost.gnu.org>
Hello.
> 1 nov 2014 kl. 19:07 skrev Glenn Morris <rgm@gnu.org>:
>
>
> There were conflicts (in macfont.m and nsterm.m) when merging recent NS
> changes from emacs-24 to trunk. Please could you check the result.
Done.
Jan D.
prev parent reply other threads:[~2014-11-01 20:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-01 18:07 ns merge conflicts Glenn Morris
2014-11-01 20:07 ` Jan Djärv [this message]
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=7763292D-46F9-4FB3-A283-E431F1BEA067@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.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.