From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Wed, 26 Nov 2014 15:01:05 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87ioi191fi.fsf@lifelogs.com> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417032059 30387 80.91.229.3 (26 Nov 2014 20:00:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 20:00:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 26 21:00:53 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 1Xtilh-0003x0-7F for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 21:00:53 +0100 Original-Received: from localhost ([::1]:35838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtilg-0006zt-S2 for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 15:00:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtilZ-0006zf-9I for emacs-devel@gnu.org; Wed, 26 Nov 2014 15:00:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtilT-000570-Rx for emacs-devel@gnu.org; Wed, 26 Nov 2014 15:00:45 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:55271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtilT-00054H-BL for emacs-devel@gnu.org; Wed, 26 Nov 2014 15:00:39 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XtilQ-0003jR-Sr for emacs-devel@gnu.org; Wed, 26 Nov 2014 21:00:36 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 26 Nov 2014 21:00:36 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 26 Nov 2014 21:00:36 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 16 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:zZlKFiQ6a1Or1Y2kRIXEonLzBb0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:178321 Archived-At: On Wed, 26 Nov 2014 20:02:22 +0100 David Engster wrote: DE> Stefan Monnier writes: >> You might prefer to wait for the gitmerge.el to appear (I thought it >> was supposed to be done already, but I guess it's taking a bit more >> time than expected). DE> Seems like you overlooked this: DE> http://article.gmane.org/gmane.emacs.devel/178096 I'm probably not the right person to test this, having done no merges before. I'll do this one manually. Ted