From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Wed, 26 Nov 2014 17:16:26 -0500 Message-ID: References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417040210 11170 80.91.229.3 (26 Nov 2014 22:16:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 22:16:50 +0000 (UTC) Cc: Ted Zlatanov , emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 26 23:16:43 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 1Xtkt9-0005DP-Hk for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 23:16:43 +0100 Original-Received: from localhost ([::1]:36288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtkt9-0002qT-1w for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 17:16:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtkt0-0002qL-HS for emacs-devel@gnu.org; Wed, 26 Nov 2014 17:16:40 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xtksu-0001oe-Av for emacs-devel@gnu.org; Wed, 26 Nov 2014 17:16:34 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:60278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtksu-0001oY-78 for emacs-devel@gnu.org; Wed, 26 Nov 2014 17:16:28 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAQMGR7U014485; Wed, 26 Nov 2014 17:16:27 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 0808A4820; Wed, 26 Nov 2014 17:16:27 -0500 (EST) In-Reply-To: <87k32hrdj5.fsf@engster.org> (David Engster's message of "Wed, 26 Nov 2014 20:02:22 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Level: * X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 1.2 X-NAI-Spam-Rules: 7 Rules triggered GEN_SPAM_FEATRE=0.2, SLS_HPL=0.2, SLS_HPL_W_SORT_LNK_1HTP_CTPLN_W_GEN_SPAM_FEATRE=0.2, SORT_LNK_1HTP_CTPLN=0.2, SORT_LNK_1HTP_CTPLN_W_GEN_SPAM_FEATRE=0.2, SORT_LNK_1HTP_CTPLN_W_SLS_HPL=0.2, RV5137=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5137> : inlines <1565> : streams <1349161> : uri <1836263> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 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:178334 Archived-At: > Seems like you overlooked this: > http://article.gmane.org/gmane.emacs.devel/178096 Indeed, I missed it. Please install it into admin/gitmerge.el, thank you. Stefan