Nicolas Cellier uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-nice.324.mcz==================== Summary ====================
Name: Monticello-nice.324
Author: nice
Time: 14 October 2009, 11:27:49 am
UUID: 34703811-f6ca-4ec1-a8bc-ca62205707c8
Ancestors: Monticello-ar.323
Sort the conflicts.
This is required when merging a distant version, like Pharo for example...
=============== Diff against Monticello-ar.323 ===============
Item was changed:
----- Method: MCMergeBrowser>>merger: (in category 'as yet unclassified') -----
merger: aMerger
merger := aMerger.
items := aMerger operations asSortedCollection.
+ conflicts := aMerger conflicts sort: [:a :b | a operation <= b operation].!
- conflicts := aMerger conflicts.!
Locked
