Havoc Pennington 9dc6f77078 Fix behavior when merging object,primitive,object. ... The AbstractConfigObject.merge() method was wrong; it merged in the wrong order, which produced incorrect results. But there was a test verifying that the results were wrong! So it's OK right? Anyway, fix the test, fix the code, be sure it's crystal clear in spec.		2011-11-16 22:07:14 -05:00
..
main/java/com/typesafe/config	Fix behavior when merging object,primitive,object.	2011-11-16 22:07:14 -05:00
test	Fix behavior when merging object,primitive,object.	2011-11-16 22:07:14 -05:00