Nicolas Cellier uploaded a new version of ScriptLoader to project The Trunk:
http://source.squeak.org/trunk/ScriptLoader-nice.332.mcz

==================== Summary ====================

Name: ScriptLoader-nice.332
Author: nice
Time: 23 March 2010, 10:30:48.777 pm
UUID: 4c233d46-f49c-43ab-b77e-e186a03c6d62
Ancestors: ScriptLoader-nice.331

Fix underscores

=============== Diff against ScriptLoader-nice.331 ===============

Item was changed:
  ----- Method: ScriptLoader>>loadTogether:merge: (in category 'private helpers') -----
  loadTogether: aCollection merge: aBoolean
  	| loader |
+ 	loader := aBoolean
- 	loader _ aBoolean
  		ifTrue: [ MCVersionMerger new ]
  		ifFalse: [ MCVersionLoader new].
  	(self newerVersionsIn: aCollection)
  		do: [:fn | loader addVersion: (self repository loadVersionFromFileNamed: fn)]
    	  	displayingProgress: 'Adding versions...'.
  	aBoolean
  		ifTrue: [[loader merge] on: MCMergeResolutionRequest do: [:request |
  					request merger conflicts isEmpty
  						ifTrue: [request resume: true]
  						ifFalse: [request pass]]]
  		ifFalse: [loader load]
  
  !

Item was changed:
  ----- Method: ScriptLoader>>mergePackagesNamed: (in category 'private helpers') -----
  mergePackagesNamed: names
  	| vm  |
+ 	repository := MCHttpRepository
- 	repository _ MCHttpRepository
                  location: 'http://source.squeakfoundation.org/39a'
                  user: ''
                  password: ''.
  
+ 	vm := MCVersionMerger new.
- 	vm _ MCVersionMerger new.
  	names
  		do: [:fn | vm addVersion: (repository loadVersionFromFileNamed: fn)]
  		displayingProgress: 'Adding versions...'.
  
  	[vm merge]
  		on: MCMergeResolutionRequest do: [:request |
  			request merger conflicts isEmpty
  				ifTrue: [request resume: true]
  				ifFalse: [request pass]]!