Mailing-List:	contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT sources DOT redhat DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT sources DOT redhat DOT com>
List-Help:	<mailto:cygwin-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT sources DOT redhat DOT com
Delivered-To:	mailing list cygwin AT sources DOT redhat DOT com
Message-ID:	<3A236297.3F5CD9E3@cseg.com>
Date:	Tue, 28 Nov 2000 02:45:27 -0500
From:	Christopher Cobb <ccobb AT cseg DOT com>
X-Mailer:	Mozilla 4.76 [en] (X11; U; Linux 2.2.16 i686)
X-Accept-Language:	en
MIME-Version:	1.0
To:	cygwin AT sourceware DOT cygnus DOT com
Subject:	cvs end-of-line translation
References:	<975399260 DOT 12252 DOT ezmlm AT sources DOT redhat DOT com>

I am getting whole-file conflicts where the only difference is the
presence of ^M's in one version and not in the other.

Does this have to do with how the end-of-file setting is set in cygwin?

We have unix/linux clients and windows clients (with cygwin).  Cygwin
and non-cygwin tools are used to edit files (i.e., tools which put ^M's
into the files).

How can I avoid whole-file conflicts?

I am using the latest version of cygwin as of 11/2x/2000.

cc

--
Want to unsubscribe from this list?
Send a message to cygwin-unsubscribe AT sourceware DOT cygnus DOT com

- Raw text -