Author: ericwa Date: Sun Sep 8 08:09:41 2013 New Revision: 9040 URL: http://svn.gna.org/viewcvs/etoile?rev=9040&view=rev Log: merging: add a resolveConflictsFavoringSourceIdentifier method
Modified:
trunk/Etoile/Frameworks/CoreObject/Diff/COItemGraphDiff.h
trunk/Etoile/Frameworks/CoreObject/Diff/COItemGraphDiff.m
trunk/Etoile/Frameworks/CoreObject/Tests/TestMerge.m
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
