mergemaster broken -- take 2

[Ben Morrow]

In article <496819F0.9 at vintners.net> you write:
>   cvsup -g -L 2 -h cvsup10.freebsd.org |& tee /root/cvsup-090108.out
>   make buildworld |& tee /root/make-buildworld-090108.out
>   make kernel KERNCONF=GENERIC |& tee /root/make-kernel-090108.out

You know about script(1) I take it? It makes keeping a log like this
much easier.

Ben