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: merging emacs-24 Date: Thu, 27 Nov 2014 19:31:30 +0100 Message-ID: <87fvd4trzx.fsf@igel.home> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> <87vbm0a6zv.fsf@engster.org> <8361e0o7ee.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417113121 22597 80.91.229.3 (27 Nov 2014 18:32:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 18:32:01 +0000 (UTC) Cc: tzz@lifelogs.com, monnier@IRO.UMontreal.CA, David Engster , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 19:31:54 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xu3r7-0001N1-LK for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 19:31:53 +0100 Original-Received: from localhost ([::1]:41172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu3r7-0006Rc-5L for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 13:31:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu3qz-0006RV-5e for emacs-devel@gnu.org; Thu, 27 Nov 2014 13:31:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu3qu-0002lD-GL for emacs-devel@gnu.org; Thu, 27 Nov 2014 13:31:45 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:42707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu3qo-0002kU-PQ; Thu, 27 Nov 2014 13:31:34 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jpSGr2Mdsz3hjT2; Thu, 27 Nov 2014 19:31:32 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jpSGr1F2XzvkGC; Thu, 27 Nov 2014 19:31:32 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id GEH30yo9eE0f; Thu, 27 Nov 2014 19:31:31 +0100 (CET) X-Auth-Info: C0mbheRifUuPZUISR3XQUhrPGRI3ND+kIPkI1bLpxrOC7Y1SDGegQMA/fRmJgmKb Original-Received: from igel.home (ppp-188-174-148-81.dynamic.mnet-online.de [188.174.148.81]) by mail.mnet-online.de (Postfix) with ESMTPA; Thu, 27 Nov 2014 19:31:30 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id C06682C259C; Thu, 27 Nov 2014 19:31:30 +0100 (CET) X-Yow: OKAY!! Turn on the sound ONLY for TRYNEL CARPETING, FULLY-EQUIPPED R.V.'S and FLOATATION SYSTEMS!! In-Reply-To: <8361e0o7ee.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 27 Nov 2014 19:55:21 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178376 Archived-At: Eli Zaretskii writes: >> From: David Engster >> Date: Thu, 27 Nov 2014 18:27:48 +0100 >> Cc: Ted Zlatanov , emacs-devel@gnu.org >> >> Stefan Monnier writes: >> >> Seems like you overlooked this: >> >> http://article.gmane.org/gmane.emacs.devel/178096 >> > >> > Indeed, I missed it. Please install it into admin/gitmerge.el, >> >> Done. > > Thanks, but why on master and not on emacs-24? Why emacs-24? It's not installed, so you need to load it manually anyway. 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."