[Sbcl-devel] Re: [Sbcl-commits] CVS: sbcl NEWS,1.490,1.491 package-data-list.lisp-expr,1.262,1.263 version.lisp-expr,1.1487,1.1488

[William H. N. <wil...@ai...>]

On Fri, Mar 05, 2004 at 11:56:01AM -0500, Neil Schemenauer wrote:
> On Fri, Mar 05, 2004 at 05:02:22AM -0800, William Harold Newman wrote:
> > +<<<<<<< NEWS
> 
> > +=======
> 
> > +>>>>>>> 1.484
> 
> Unresolved merge conflict?

Oops, yes.

I remember noticing output from CVS about merging in NEWS, but I
didn't realize it was an error. I should probably read more carefully,
or put some sort of "find | xargs egrep '>>>>>'" incantation into
tests/, or both.

Thanks for pointing it out.

-- 
William Harold Newman <wil...@ai...>
"Do you like functional programming?"
"I named my firstborn 'Continuation Passing Style'. -- 7%"
  -- poll, <http://www.kuro5hin.org/story/2001/7/31/0102/11014>
PGP key fingerprint 85 CE 1C BA 79 8D 51 8C  B9 25 FB EE E0 C3 E5 7C