work (Rick) wrote:
> Jim Hyslop pointed out that my confidential message wouldn't
> allow a reply so I setup a different mailbox for the list
> that doesn't contain such restrictions. This is a repeat of
> my eariler message.
Thanks, Rick, and sorry to be so nit-picky.
I did see some email ex
>--- Forwarded mail from [EMAIL PROTECTED]
>On Thu, 17 Jun 2004, Feldmann, Rick wrote:
>> Date: Thu, 17 Jun 2004 11:53:55 -0400
>> From: "Feldmann, Rick" <[EMAIL PROTECTED]>
>> To: 'Kaz Kylheku' <[EMAIL PROTECTED]>
>> Cc: "&
Jim Hyslop pointed out that my confidential message wouldn't allow a reply
so I setup a different mailbox for the list that doesn't contain such
restrictions. This is a repeat of my eariler message.
I read somewhere that cvs update uses diff to figure out modifications to
the files. However,
On Thu, 17 Jun 2004, Feldmann, Rick wrote:
> Date: Thu, 17 Jun 2004 11:53:55 -0400
> From: "Feldmann, Rick" <[EMAIL PROTECTED]>
> To: 'Kaz Kylheku' <[EMAIL PROTECTED]>
> Cc: "'[EMAIL PROTECTED]'" <[EMAIL PROTECTED]>
> Subje
Feldmann, Rick wrote:
> "Confidentiality Notice: The information contained in this
> transmission is
> confidential, proprietary, or privileged and may be subject
> to protection
> under the Health Insurance Portability and Accountability Act
> of 1996 or
> other legal sanction. The message i
sender by reply e-mail and destroy all copies
of the original message."
-Original Message-
From: Kaz Kylheku [mailto:[EMAIL PROTECTED] Behalf Of Kaz Kylheku
Sent: Thursday, June 17, 2004 11:41 AM
To: Feldmann, Rick
Cc: '[EMAIL PROTECTED]'
Subject: Re: cvs merging - confl
On Thu, 17 Jun 2004, Feldmann, Rick wrote:
> I read somewhere that cvs update uses diff to figure out modifications to
> the files.
The merging algorithm is based on the three-way merge program diff3.
> However, it doesn't appear to use the same diff as cvs diff -
That's correct. diff and di
I read somewhere that cvs update uses diff to figure out modifications to
the files. However, it doesn't appear to use the same diff as cvs diff -
Part of it is the white space issue, and there doesn't appear to be and
option in update to ignore white space. However, regardless of how I cvs
diff
