Mailing-List: contact cygwin-help@sourceware.cygnus.com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@sources.redhat.com Delivered-To: mailing list cygwin@sources.redhat.com From: Chuck.Irvine@mail.sprint.com X-OpenMail-Hops: 1 Date: Wed, 29 Nov 2000 12:22:02 -0600 Message-Id: Subject: ediff falsely identifying a difference as white space only MIME-Version: 1.0 TO: cygwin@sourceware.cygnus.com, ntemacs-users@cs.washington.edu Content-Type: multipart/mixed; boundary="openmail-part-1ad36109-00000001" --openmail-part-1ad36109-00000001 Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: inline ;Creation-Date="Wed, 29 Nov 2000 12:22:02 -0600" Content-Transfer-Encoding: 8bit I'm trying to use vc-resolve-conflicts using ntemacs (20.7.1) and Cygwin (1.1.x). First I had to download the newestest version of ediff because the one that ships with ntemacs expects a version of diff(3) that accepts the -binary flag. Diff that comes with Cygwin doesn't accept this arg. After I installed ediff, I tried to invoke vc-resolve-conflicts on the attached file (A.java). The ediff windows came up as expected, highlighting a single conflict. The problem is that when I moved to this conflict, ediff outputs in the mode line "Only white-space differences in region 1 in buffers A & B" which, if you look, isn't the case. I suspect that the problem might have something to do with those cursed "^M"s - I don't know. I suspect this because when I look into the *ediff-fine-diff* buffer, I see: ====1^M 1:3c^M ddsdfsdffadfs^M 2:3c^M 3:3c^M dbbkk^M I'd really like to use ediff's conflict related functionality. Any help is much appreciated. Thanks Chuck Irvine Sprint --openmail-part-1ad36109-00000001 Content-Type: application/octet-stream Content-Disposition: attachment; filename="A.java" ;Creation-Date="Wed, 29 Nov 2000 12:22:02 -0600" Content-Transfer-Encoding: base64 cHVibGljIGNsYXNzIEEgew0KDQo8PDw8PDw8IEEuamF2YQ0KcHVibGljIEIgZGRzZGZzZGZm YWRmczsNCj09PT09PT0NCnB1YmxpYyBCIGRiYmtrOw0KPj4+Pj4+PiAxLjYNCiANCiAgcHVi bGljIEMgZDoNCg0KfQ0K --openmail-part-1ad36109-00000001 Content-Type: text/plain; charset=us-ascii -- Want to unsubscribe from this list? Send a message to cygwin-unsubscribe@sourceware.cygnus.com --openmail-part-1ad36109-00000001--