Merge pull request #1724 from Ducasse/2023-09-03-Bottom

Improve Merge (after ESUG git lecture there is a need).
pharo-vcs · Sep 4, 2023 · e5d10cc · e5d10cc
2 parents 57da1d6 + 7268995
commit e5d10cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st
@@ -16,7 +16,7 @@ IceTipMergeCommand class >> defaultDescription [
 { #category : #'accessing - defaults' }
 IceTipMergeCommand class >> defaultName [
 
-	^ 'Merge'
+	^ 'Merge to current'
 ]
 
 { #category : #testing }

diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st
@@ -48,5 +48,5 @@ IceTipRepositoryBrowserTest >> testHasMergeButtonOnTheLeft [
 	self
 		assert:
 			(presenter toolbar leftItems
-				anySatisfy: [ :aButton | aButton label = 'Merge' ])
+				anySatisfy: [ :aButton | 'Merge*' match: aButton label ])
 ]