--- libaitcfg/example/test.c	2012/04/03 12:54:49	1.1.2.10
+++ libaitcfg/example/test.c	2012/04/03 12:59:21	1.1.2.11
@@ -59,13 +59,12 @@ int main()
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", ""));
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, NULL, "att"));
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", "attr2"));
-	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999"));
+	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999"));
 
 	cfgWriteConfig(stdout, &tmp, 0);
 	cfgWriteConfig(stdout, &lst, 1);
 	printf("1) ---------------------------------\n");
-	printf("%d\n---------------------------------\n", cfgMergeConfig(&lst, &tmp));
-	cfgWriteConfig(stdout, &lst, 1);
+
 #if 0
 //	printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp));
 //	WriteConfig(stdout, &lst);
@@ -75,7 +74,13 @@ int main()
 	printf("CreateConfig=%d\n", CreateConfig("test4e.cfg", &lst));
 	printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError());
 #endif
-	cfgUnloadConfig(&lst);
+
+#ifndef SKIP_TEST_MERGE
+	printf("merge=%d\n---------------------------------\n", cfgMergeConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 1);
+#else
 	cfgUnloadConfig(&tmp);
+#endif
+	cfgUnloadConfig(&lst);
 	return 0;
 }