Move TestAttributedStringDiff -testMerge to TestAttributedStringMerge -testMergeOverlappingAttributeAdditions

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile/Frameworks/CoreObject@10021 7b3f36aa-e6db-49c1-8b4c-66eac1997e64