[Etoile-cvs] r9020 - in /trunk/Etoile/Frameworks/CoreObject: Core/COBranch.h Core/COBranch.m CoreObject.h CoreObject.xcodeproj/project.pbxproj Diff/COLeastCommonAncestor.h Diff/COLeastCommonAncestor.m Diff/COMergeInfo.h Diff/COMergeInfo.m Tests/TestMerge.m

Tue, 03 Sep 2013 16:08:23 -0700 

Author: ericwa
Date: Wed Sep  4 01:07:00 2013
New Revision: 9020

URL: http://svn.gna.org/viewcvs/etoile?rev=9020&view=rev
Log:
Add simple merge test

Added:
    trunk/Etoile/Frameworks/CoreObject/Diff/COLeastCommonAncestor.h
    trunk/Etoile/Frameworks/CoreObject/Diff/COLeastCommonAncestor.m
    trunk/Etoile/Frameworks/CoreObject/Diff/COMergeInfo.h
    trunk/Etoile/Frameworks/CoreObject/Diff/COMergeInfo.m
Modified:
    trunk/Etoile/Frameworks/CoreObject/Core/COBranch.h
    trunk/Etoile/Frameworks/CoreObject/Core/COBranch.m
    trunk/Etoile/Frameworks/CoreObject/CoreObject.h
    trunk/Etoile/Frameworks/CoreObject/CoreObject.xcodeproj/project.pbxproj
    trunk/Etoile/Frameworks/CoreObject/Tests/TestMerge.m


_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs

Reply via email to