From: mdw <mdw>
Date: Tue, 13 Sep 2005 16:56:02 +0000 (+0000)
Subject: Fix error message in merge.
X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/commitdiff_plain/d32965008f328887b38d68d27665503ee875bfe5?ds=sidebyside;hp=d32965008f328887b38d68d27665503ee875bfe5

Fix error message in merge.
---