[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| '
|
From: |
Greg A. Woods |
|
Subject: |
Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>> |^\|\|\|\|\|\|\| ' |
|
Date: |
Wed, 18 Jul 2001 13:29:12 -0400 (EDT) |
[ On Wednesday, July 18, 2001 at 00:25:22 (-0700), Paul Sander wrote: ]
> Subject: Re: Results of egrep -l '^<<<<<<< |^=======$|^>>>>>>>
> |^\|\|\|\|\|\|\| '
>
> All of them, if they're checked in on vendor branches.
Vendor branch support is an entirely different critter and does not
belong in this discussion.
(however iff changes are made to such a file in a vendor-branched module
then it's trivial to also get rid of or hide the real-looking merge
conflict markers, just as one would do if they were first-rate source
files in a non-vendor-branched module)
--
Greg A. Woods
+1 416 218-0098 VE3TCP <address@hidden> <address@hidden>
Planix, Inc. <address@hidden>; Secrets of the Weird <address@hidden>