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
X-Apparently-From:	<jwalsky AT yahoo DOT com>
Message-ID:	<009e01c0c798$61251330$2001000a@pinto>
From:	"Joshua Walsky" <jwalsky AT yahoo DOT com>
To:	<cygwin AT cygwin DOT com>
Subject:	emacs and cvs : ediff, merge, and ^M
Date:	Tue, 17 Apr 2001 18:44:42 -0500
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-Mailer:	Microsoft Outlook Express 5.50.4133.2400
X-MimeOLE:	Produced By Microsoft MimeOLE V5.50.4133.2400

I saw the thread initiated by Chuck Irvine about ediff and carriage returns
(^M) on Windows back in November, but could not find any resolution.

http://cygwin.com/ml/cygwin/2000-11/threads.html#01515

I am experiencing similar problems, both --binary not being understood and
^M appearing upon merge.  When files are merged through the cvs update
command (with or without conflicts) ^M are inserted in the new versions.
It seems that whatever is doing the merge for cvs is inserting these
carriage returns?  Is there any way to stop this?  Is this a configuration
issue?  I am not too concerned about the --binary issue since I really
haven't looked into it thoroughly enough, however, I could use some help
with the carriage returns.

The ediff version I have is 2.70.2 (as indicated by ediff-version)
The emacs version I have is 20.7.1 (as indicated by version)
The cvs version is 1.11 (as indicated by cvs --version)
My cygwin.dll version is 1.1.8 (that is the version I downloaded... how can
I figure this out if I forgot?)

Thanks in advance,
- joshua


_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com


--
Want to unsubscribe from this list?
Check out: http://cygwin.com/ml/#unsubscribe-simple

- Raw text -