Changes between Version 2 and Version 3 of SoC2007Darcs


Ignore:
Timestamp:
Jul 6, 2007 6:03:46 PM (7 years ago)
Author:
JasonDagit
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • SoC2007Darcs

    v2 v3  
    11= Complete =  
    22 * Create '''conflicted''' patch type to store conflicted patches, and associated commutation rules 
    3  * Create a new merge algorithm that handles conflicts by generating conflicted patches 
     3 * Create a new merge algorithm that handles conflicts by generating conflicted patches, temporary description of new merge can be found here: http://codersbase.com/index.php/Darcs_Merge (doesn't always display correctly for some reason.) 
    44 
    55= In Progress =