Fix error message in merge.
[u/mdw/catacomb] / key-error.h
2004-11-11 mdwProvide better interface to key locking.