Author: ericwa
Date: Thu Jan 16 22:31:53 2014
New Revision: 10081
URL: http://svn.gna.org/viewcvs/etoile?rev=10081&view=rev
Log:
For attributed string merge, allow -resolveConflictsFavoringSourceIdentifier:
to control the order of conflicting inserts (e.g. insert 'x' and index 0 and
insert 'y' at index 0)
Modified:
trunk/Etoile/Frameworks/CoreObject/Extras/Diff/COAttributedStringDiff.h
trunk/Etoile/Frameworks/CoreObject/Extras/Diff/COAttributedStringDiff.m
trunk/Etoile/Frameworks/CoreObject/Tests/Extras/Model/TestAttributedStringMerge.m
trunk/Etoile/Frameworks/CoreObject/Tests/Synchronization/TestSynchronizer.m
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
