Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| '

[Greg A. Woods]

[ On Tuesday, July 17, 2001 at 19:46:04 (+0200), Pascal Bourguignon wrote: ]
> Subject: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| '
>
> 
> There are 328 matching files not  related to CVS.

Perhaps I should have been more explicit in my instructions.  A list of
files like that is pretty much useless since a third party has no way to
tell which might potentially be source files, and which have some format
or syntax restrictions require the strings to be inserted in exactly a
way that could be mistaken as conflict markers.....

So, which of those are "source files" that could not easily be fixed to
avoid having detectable conflict markers?

Looks like maybe one, and maybe not even it if it's actually a generated
file, or has a flexible enough syntax:

    /usr/lib/figlet22/fonts/contributed/doh.flf

Are any of those that are source files considered "non-mergable"
(i.e. would they have to be checked into CVS with '-kb'?)

-- 
                                                        Greg A. Woods

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