[darcs-users] Help: pending has conflicts

[Alistair Bayley]

Hello,

When I say "darcs whatsnew --summary" I get

plink: unknown option "-O"
Yikes, pending has conflicts!
R ./Database/Oracle/OCIFunctions_stub.c
R ./Database/Oracle/OCIFunctions_stub.h
R ./Database/PostgreSQL/PGFunctions_stub.c
R ./Database/PostgreSQL/PGFunctions_stub.h

The four deleted files exist on the filesystem, but they should not be
part of the repo, as they are generated from .hs sources. I've done
darcs repair and check, so I'm at a bit of a loss as to what to do
next.

Win XP, darcs 1.0.7.

Thanks,
Alistair