From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Chong Yidong <cyd@stupidchicken.com>
Newsgroups: gmane.emacs.devel
Subject: Re: Release plans
Date: Mon, 21 Jul 2008 09:32:01 -0400
Message-ID: <87d4l7nz1q.fsf@stupidchicken.com>
References: <87r69wcxn7.fsf@stupidchicken.com>
	<87prp7vo3k.fsf@stupidchicken.com> <873am38xun.fsf@ambire.localdomain>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: ger.gmane.org 1216647137 5152 80.91.229.12 (21 Jul 2008 13:32:17 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 21 Jul 2008 13:32:17 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Thien-Thi Nguyen <ttn@gnuvola.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jul 21 15:33:06 2008
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 ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1KKvVh-0000of-Bz
	for ged-emacs-devel@m.gmane.org; Mon, 21 Jul 2008 15:33:05 +0200
Original-Received: from localhost ([127.0.0.1]:58089 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1KKvUo-0004r0-6D
	for ged-emacs-devel@m.gmane.org; Mon, 21 Jul 2008 09:32:10 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KKvUi-0004pV-N7
	for emacs-devel@gnu.org; Mon, 21 Jul 2008 09:32:04 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KKvUg-0004op-FQ
	for emacs-devel@gnu.org; Mon, 21 Jul 2008 09:32:03 -0400
Original-Received: from [199.232.76.173] (port=34282 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KKvUg-0004om-AI
	for emacs-devel@gnu.org; Mon, 21 Jul 2008 09:32:02 -0400
Original-Received: from c-24-63-201-57.hsd1.ma.comcast.net ([24.63.201.57]:17149
	helo=furry) by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <cyd@stupidchicken.com>) id 1KKvUf-00010V-Ti
	for emacs-devel@gnu.org; Mon, 21 Jul 2008 09:32:02 -0400
Original-Received: by furry (Postfix, from userid 1000)
	id 9CB9EC056; Mon, 21 Jul 2008 09:32:01 -0400 (EDT)
In-Reply-To: <873am38xun.fsf@ambire.localdomain> (Thien-Thi Nguyen's message
	of "Mon, 21 Jul 2008 10:06:56 +0200")
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:101070
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/101070>

Thien-Thi Nguyen <ttn@gnuvola.org> writes:

> Ping!  (I can't remember if this was accepted or not.)
>
> *** lisp/smerge-mode.el.~1.72~	2008-07-21 09:58:34.000000000 +0200
> --- lisp/smerge-mode.el	2008-06-24 09:17:57.000000000 +0200

Looks OK to me.  Go ahead and check it in.