Re: pbulk/pbulk.sh issue

[John Klos <john%klos.com@localhost>]

> > #! /bin/sh
> > # Attempt to guess a canonical system name.
> > <<<<<<< config.guess
>
> That's a CVS conflict. To see which files are affected, you can run "cvs
> diff".
>
> To fix the conflicts, remove the files where you didn't do any concious
> changes yourself, then run "cvs update". This will update the files with
> their fresh counterparts from the CVS repository.
>
> On my local system, all these files are fine and they equal the version
> from CVS.

That makes perfect sense... I should've noticed this, but I was updating 
the wrong tree.

Thanks!
John