From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merging emacs-24
Date: Thu, 27 Nov 2014 19:55:21 +0200
Message-ID: <8361e0o7ee.fsf@gnu.org>
References: <m2h9xyzd45.fsf@jbm.io> <m2lhnamlnr.fsf@jbm.io>
	<87a93eavwt.fsf@lifelogs.com>
	<jwvd28ahs60.fsf-monnier+emacsbugs@gnu.org>
	<87wq6hap7v.fsf@lifelogs.com>
	<jwvr3wphjsy.fsf-monnier+emacsbugs@gnu.org>
	<87k32hrdj5.fsf@engster.org>
	<jwvwq6hfw0z.fsf-monnier+emacsbugs@gnu.org>
	<87vbm0a6zv.fsf@engster.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1417110926 15953 80.91.229.3 (27 Nov 2014 17:55:26 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Thu, 27 Nov 2014 17:55:26 +0000 (UTC)
Cc: tzz@lifelogs.com, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
To: David Engster <deng@randomsample.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 18:55:20 2014
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Xu3Hh-0002aN-GW
	for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 18:55:17 +0100
Original-Received: from localhost ([::1]:41016 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Xu3Hh-00063U-5F
	for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 12:55:17 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42736)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Xu3HZ-00063L-HI
	for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:55:14 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Xu3HU-0005PN-W5
	for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:55:09 -0500
Original-Received: from mtaout22.012.net.il ([80.179.55.172]:52820)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1Xu3HU-0005JR-OY
	for emacs-devel@gnu.org; Thu, 27 Nov 2014 12:55:04 -0500
Original-Received: from conversion-daemon.a-mtaout22.012.net.il by
	a-mtaout22.012.net.il (HyperSendmail v2007.08) id
	<0NFP00F00LF0K800@a-mtaout22.012.net.il> for
	emacs-devel@gnu.org; Thu, 27 Nov 2014 19:55:03 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0NFP00FCDLRQ11B0@a-mtaout22.012.net.il>;
	Thu, 27 Nov 2014 19:55:02 +0200 (IST)
In-reply-to: <87vbm0a6zv.fsf@engster.org>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10
X-Received-From: 80.179.55.172
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:178372
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/178372>

> From: David Engster <deng@randomsample.de>
> Date: Thu, 27 Nov 2014 18:27:48 +0100
> Cc: Ted Zlatanov <tzz@lifelogs.com>, 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?