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)

No differences found