Fix error message in merge.
authormdw <mdw>
Tue, 13 Sep 2005 16:56:02 +0000 (16:56 +0000)
committermdw <mdw>
Tue, 13 Sep 2005 16:56:02 +0000 (16:56 +0000)
commitd32965008f328887b38d68d27665503ee875bfe5
tree3d1ff5d960b0b19d3fd502ad7a45d58f17d2fe0f
parent0ac1f1861deec96a169e947b7716bd83a8c81bce
Fix error message in merge.
keyutil.c