From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: emacs-23 to trunk: merge conflicts in files.el Date: Sat, 12 Feb 2011 20:54:27 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1297562078 32526 80.91.229.12 (13 Feb 2011 01:54:38 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 13 Feb 2011 01:54:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 13 02:54:33 2011 Return-path: 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 ) id 1PoRAW-00078s-RD for ged-emacs-devel@m.gmane.org; Sun, 13 Feb 2011 02:54:33 +0100 Original-Received: from localhost ([127.0.0.1]:59508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoRAW-0001nh-1P for ged-emacs-devel@m.gmane.org; Sat, 12 Feb 2011 20:54:32 -0500 Original-Received: from [140.186.70.92] (port=33694 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoRAS-0001nc-Q1 for emacs-devel@gnu.org; Sat, 12 Feb 2011 20:54:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoRAR-0003LJ-TF for emacs-devel@gnu.org; Sat, 12 Feb 2011 20:54:28 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:54822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PoRAR-0003LF-PJ for emacs-devel@gnu.org; Sat, 12 Feb 2011 20:54:27 -0500 Original-Received: from cyd by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1PoRAR-0006Pp-HU; Sat, 12 Feb 2011 20:54:27 -0500 In-Reply-To: (Glenn Morris's message of "Sat, 12 Feb 2011 18:35:57 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) 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." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:135962 Archived-At: Glenn Morris writes: > 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? I just did the merge. (I was going to do it immediately after 100467, but got held up.)