[Gnucash-changes] r12962 - gnucash/trunk/src/app-utils - Expand on the error message

[Neil Williams]

Author: codehelp
Date: 2006-01-23 14:00:46 -0500 (Mon, 23 Jan 2006)
New Revision: 12962
Trac: http://svn.gnucash.org/trac/changeset/12962

Modified:
   gnucash/trunk/src/app-utils/gnc-account-merge.c
Log:
Expand on the error message

Modified: gnucash/trunk/src/app-utils/gnc-account-merge.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-account-merge.c	2006-01-23 19:00:26 UTC (rev 12961)
+++ gnucash/trunk/src/app-utils/gnc-account-merge.c	2006-01-23 19:00:46 UTC (rev 12962)
@@ -13,7 +13,8 @@
     return GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW;
 
   if (xaccAccountGetPlaceholder(existing_acct) != xaccAccountGetPlaceholder(new_acct))
-    return GNC_ACCOUNT_MERGE_DISPOSITION_ERROR;
+/*    return GNC_ACCOUNT_MERGE_DISPOSITION_ERROR;*/
+    return GNC_ACCOUNT_MERGE_DISPOSITION_USE_EXISTING;
 
   return GNC_ACCOUNT_MERGE_DISPOSITION_USE_EXISTING;
 }