From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: emacs-23 to trunk: merge conflicts in files.el
Date: Sat, 12 Feb 2011 18:35:57 -0500
Message-ID: <d4fwrs4yhu.fsf@fencepost.gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: dough.gmane.org 1297554572 5368 80.91.229.12 (12 Feb 2011 23:49:32 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Sat, 12 Feb 2011 23:49:32 +0000 (UTC)
To: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 13 00:49:28 2011
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.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PoPDT-0003jt-JK
	for ged-emacs-devel@m.gmane.org; Sun, 13 Feb 2011 00:49:27 +0100
Original-Received: from localhost ([127.0.0.1]:47739 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PoPDS-0001eb-Pn
	for ged-emacs-devel@m.gmane.org; Sat, 12 Feb 2011 18:49:26 -0500
Original-Received: from [140.186.70.92] (port=48882 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PoPAt-0008OY-FD
	for emacs-devel@gnu.org; Sat, 12 Feb 2011 18:46:48 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1PoP0R-0000Ys-Ns
	for emacs-devel@gnu.org; Sat, 12 Feb 2011 18:36:00 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:50354)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1PoP0R-0000Yo-KK
	for emacs-devel@gnu.org; Sat, 12 Feb 2011 18:35:59 -0500
Original-Received: from localhost ([127.0.0.1]:40841)
	by fencepost.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rgm@gnu.org>)
	id 1PoP0Q-0007uO-3x; Sat, 12 Feb 2011 18:35:58 -0500
X-Spook: CESID ASIO quarter infowar Indigo data haven Security
X-Ran: //_NM5tiEI'6(m:F#/euq3>MeZ2F2*et%K`|L;,L]]w)7UaeNQSa]he[>4<@NQ@vI|u|\>
X-Hue: magenta
X-Attribution: GM
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 140.186.70.10
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/archive/html/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:135961
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/135961>


I tried merging emacs-23 to trunk, but was unable to resolve a series of
confusing conflicts in files.el. Are commits 100467 and 100455 supposed
to be merged?