RE: merge mode for XML

[Greg A. Woods]

[ On Friday, April 26, 2002 at 08:16:44 (-0500), Sean Hager wrote: ]
> Subject: RE: merge mode for XML
>
> I am not a CVS expert, but I was thinking that perhaps the tags
> diff3 was looking for were different for xml.  I am going to test it
> some more, prehaps I will have to look into the source code, but I 
> was hoping someone on the list had some experience with this.

Diff and diff3 look for changes across entire lines of text -- i.e. the
separator is the newline.  Judicious use of blank lines, or other syntax
elements that won't normally change (eg. comments!) will help separate
related units by enough static lines that diff and diff3 won't blurr
them into one "change".

-- 
                                                                Greg A. Woods

+1 416 218-0098;  <address@hidden>;  <address@hidden>;  <address@hidden>
Planix, Inc. <address@hidden>; VE3TCP; Secrets of the Weird <address@hidden>