[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Coflict marker detection proposal
From: |
Greg A. Woods |
Subject: |
Re: Coflict marker detection proposal |
Date: |
Thu, 19 Jul 2001 13:52:51 -0400 (EDT) |
[ On Thursday, July 19, 2001 at 10:52:10 (-0400), Noel L Yap wrote: ]
> Subject: Re: Coflict marker detection proposal
>
> That's right, CVS is a concurrent versioning system. It is not, however, a
> concurrent versioning system that must use diff3 as its merge tool. diff3 is
> not the only tool that can be used for merging. So, I shouldn't have to "get
> a
> real non-concurrent versioning
Actually CVS is a concurrent versioning system that *DOES* use diff3.
Yes, there's a difference. Sorry you can't seem to appreciate it.
--
Greg A. Woods
+1 416 218-0098 VE3TCP <address@hidden> <address@hidden>
Planix, Inc. <address@hidden>; Secrets of the Weird <address@hidden>
- Re: Coflict marker detection proposal, (continued)
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/18
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/18
- RE: Coflict marker detection proposal, Kostur, Andre, 2001/07/18
- RE: Coflict marker detection proposal, Noel L Yap, 2001/07/18
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/19
- Re: Coflict marker detection proposal,
Greg A. Woods <=
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/19
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/19
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/20
- Re: Coflict marker detection proposal, Noel L Yap, 2001/07/20