From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 18:27:48 +0100 Message-ID: <87vbm0a6zv.fsf@engster.org> 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 1417109305 19810 80.91.229.3 (27 Nov 2014 17:28:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 17:28:25 +0000 (UTC) Cc: Ted Zlatanov , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:28:18 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 1Xu2ra-00081i-KD for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:28:18 +0100 Original-Received: from localhost ([::1]:40921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2ra-0001VZ-5o for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:28:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2rH-0001Ub-2T for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:28:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu2rB-0002WT-KS for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:27:59 -0500 Original-Received: from randomsample.de ([5.45.97.173]:55612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu2rB-0002W5-BB for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:27:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=/cjGiu+evNL4MoO5EDnLtUPCNVBIy9MmxHtG+WL1UO4=; b=pfNbdrvB2tCGh3IoaTQrImOBfq2slrawayjj2APRb7l8PPXqnTUBFWRGX+xB/HkLBCyfWn4f5I1rMyzqJ8bzdlmVaP20shmwW4q7DuOnC6ghUm1TxDlBvFzPv2br9iNN; Original-Received: from ip4d154d80.dynamic.kabel-deutschland.de ([77.21.77.128] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xu2r8-0007mu-4k; Thu, 27 Nov 2014 18:27:50 +0100 In-Reply-To: (Stefan Monnier's message of "Wed, 26 Nov 2014 17:16:26 -0500") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:178369 Archived-At: 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. -David