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: bogus cvs conflict in files.texi
Date: Tue, 08 Jan 2008 23:13:31 -0500
Message-ID: <e3zlvffxg4.fsf@fencepost.gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: ger.gmane.org 1199852024 25447 80.91.229.12 (9 Jan 2008 04:13:44 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Wed, 9 Jan 2008 04:13:44 +0000 (UTC)
To: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 09 05:14:05 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 1JCSKG-000735-86
	for ged-emacs-devel@m.gmane.org; Wed, 09 Jan 2008 05:14:00 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1JCSJs-0001jW-RW
	for ged-emacs-devel@m.gmane.org; Tue, 08 Jan 2008 23:13:36 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JCSJp-0001j8-Au
	for emacs-devel@gnu.org; Tue, 08 Jan 2008 23:13:33 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JCSJo-0001iY-CZ
	for emacs-devel@gnu.org; Tue, 08 Jan 2008 23:13:32 -0500
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JCSJo-0001iT-9F
	for emacs-devel@gnu.org; Tue, 08 Jan 2008 23:13:32 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rgm@gnu.org>) id 1JCSJo-00037R-5I
	for emacs-devel@gnu.org; Tue, 08 Jan 2008 23:13:32 -0500
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.67)
	(envelope-from <rgm@gnu.org>)
	id 1JCSJn-0002Y3-HW; Tue, 08 Jan 2008 23:13:31 -0500
X-Spook: Audiotel investigation SWAT PGP Glock plutonium FIPS140
X-Ran: CU6P7(KsuRmtnDY3]qLcJIRi<F{87>8m:h#J9C15IVv2J~"XM#n|ArM}c=Ci~QV<KTkBq^
X-Hue: green
X-Attribution: GM
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
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:86617
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/86617>


I just commited a change to man/*.texi in EMACS_22_BASE via PCVS, and
saw this:

In directory .:
Message: cvs commit: warning: file `files.texi' seems to still contain
conflict indicators

I'm guessing this is due to the conflict example in that file. Does it
need further hiding from CVS somehow?