(no subject)

[root]

>From address@hidden  Thu Feb 15 06:08:57 2001
>Return-Path: <address@hidden>
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164])
        by gateway.camelot.jp (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id 
GAA24594
        for <address@hidden>; Thu, 15 Feb 2001 06:08:56 +0900
Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T97p-0002aI-00; Wed, 14 Feb 2001 16:06:09 -0500
Received: from [202.144.239.157] (helo=fax.tgivan.com)
        by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
        id 14T95Y-0002WN-00
        for <address@hidden>; Wed, 14 Feb 2001 16:03:48 -0500
Received: from aukland.tgivan.com (aukland.YP.tgx [192.9.200.62])
        by fax.tgivan.com (8.9.3/8.9.1) with SMTP id MAA21783;
        Wed, 14 Feb 2001 12:58:44 -0800 (PST)
Received: from lima by aukland.tgivan.com (SMI-8.6/SMI-SVR4)
        id MAA14460; Wed, 14 Feb 2001 12:58:42 -0800
Message-Id: <address@hidden>
From: Stephen Rasku <address@hidden>
Reply-To: Stephen Rasku <address@hidden>
Subject: Re: extra spaces, tabs etc
To: address@hidden, address@hidden
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-MD5: dnX7oMV79xrZyCNlBBZ+Zg==
X-Mailer: dtmail 1.3.0 @(#)CDE Version 1.3.5 SunOS 5.7 sun4u sparc 
Sender: address@hidden
Errors-To: address@hidden
X-BeenThere: address@hidden
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:address@hidden>
List-Post: <mailto:address@hidden>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Id: Announcements and discussions for the CVS version control system 
<info-cvs.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/info-cvs>,
        <mailto:address@hidden>
List-Archive: <http://mail.gnu.org/pipermail/info-cvs/>
Date: Wed, 14 Feb 2001 12:58:42 -0800 (PST)
Status: O
Content-Length: 498
Lines: 21

Annette Waters wrote:

>
>Is there a way to tell cvs to ignore conflicts that consist of extra 
spaces,
>etc?
>

You can use "cvs diff -b" and it won't display differences in 
whitespace.  This won't help you if you are doing a merge, though.

-- 
Stephen Rasku                   E-mail: address@hidden
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs