From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 11:19:03 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264414770 18769 80.91.229.12 (25 Jan 2010 10:19:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 10:19:30 +0000 (UTC) Cc: mhershberger@intrahealth.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 11:19:22 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NZM2T-0006O0-1h for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 11:19:21 +0100 Original-Received: from localhost ([127.0.0.1]:33222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZM2U-0004KD-6P for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 05:19:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZM2M-0004Jw-Lv for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:19:14 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZM2H-0004J4-1l for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:19:13 -0500 Original-Received: from [199.232.76.173] (port=56883 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZM2G-0004J1-P8 for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:19:08 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:57774) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZM2F-0002bQ-3A; Mon, 25 Jan 2010 05:19:07 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 0FE541C00251; Mon, 25 Jan 2010 11:19:05 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 9E87F901C9; Mon, 25 Jan 2010 11:19:05 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id N0-2MVeTPvzm; Mon, 25 Jan 2010 11:19:04 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.176.225.ip-pool.NEFkom.net [83.171.176.225]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jan 2010 11:19:04 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id B57CECA298; Mon, 25 Jan 2010 11:19:03 +0100 (CET) X-Yow: Is this where people are HOT and NICE and they give you TOAST for FREE?? In-Reply-To: <83sk9u5wes.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Jan 2010 12:08:43 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120344 Archived-At: Eli Zaretskii writes: >> Not much different from >> eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. > > That merge is made of Katsumi Yamaoka's changes. I don't understand that sentence. Can you clarify? > Which is not true for Mark's merge. Both commits merge trunk into a branch. How are they different? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."