Author: ericwa
Date: Sat Sep 7 09:07:30 2013
New Revision: 9037
URL: http://svn.gna.org/viewcvs/etoile?rev=9037&view=rev
Log:
merge: fix one failing test, identify that we're not detecting sequence
conflicts
Modified:
trunk/Etoile/Frameworks/CoreObject/Diff/COArrayDiff.m
trunk/Etoile/Frameworks/CoreObject/Diff/COItemGraphDiff.m
trunk/Etoile/Frameworks/CoreObject/Diff/COSequenceMerge.m
trunk/Etoile/Frameworks/CoreObject/Tests/TestMerge.m
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
