From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 13:14:56 +0200 Message-ID: <83ljfm5tcf.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1264418120 29610 80.91.229.12 (25 Jan 2010 11:15:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 11:15:20 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 12:15:12 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 1NZMuV-0000GX-Oc for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 12:15:12 +0100 Original-Received: from localhost ([127.0.0.1]:43266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZMuW-0000B6-Uj for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 06:15:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZMuN-00009g-NQ for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:15:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZMuJ-00009B-3W for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:15:03 -0500 Original-Received: from [199.232.76.173] (port=58886 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZMuI-000097-MP for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:14:58 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:62187) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZMuI-0002eO-5Q for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:14:58 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KWS00H00V7TBH00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:14:57 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.228.141.118]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWS0070AV8UZFO0@a-mtaout20.012.net.il>; Mon, 25 Jan 2010 13:14:55 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:120352 Archived-At: > From: Andreas Schwab > Date: Mon, 25 Jan 2010 12:06:01 +0100 > Cc: emacs-devel@gnu.org >=20 > =C3=93scar Fuentes writes: >=20 > > Katsumi Yamaoka merges his changes into trunk, >=20 > No, it merges trunk into a branch. Look, Andreas, if you want to help in understanding what, if anything= , is wrong with Mark's commit, please tell that in enough words that mere mortals can understand. Otherwise, you are just raising the noise level, so please leave us alone in this thread and let us find out the truth our way. Okay?