Merge jv
authorMerge Script
Sun, 01 May 2016 06:37:41 +0200
branchjv
changeset 5688 60766cc55bfd
parent 5684 96602925bf13 (current diff)
parent 5687 51527dfbd6b4 (diff)
child 5692 2fb164455e7c
Merge
--- a/.hgtags	Fri Apr 29 06:55:43 2016 +0200
+++ b/.hgtags	Sun May 01 06:37:41 2016 +0200
@@ -38,6 +38,7 @@
 6bf83a2af71f7bf69764789b24a7922ae0f4c543 expeccoNET_1_5_0rc1
 6bf83a2af71f7bf69764789b24a7922ae0f4c543 expecco_1_8_2rc1
 6bf93f2065875a09cd4c757a01c5c2aed123c3db expecco_1_0_3
+7027fccb78ddecee0b8456003f9dc1b42e7e46b9 expecco_2_9_0
 747bf54f6fc92d630ad6871e7770f965e2b36911 rel3_6_1
 753b5270dc2ab32a79be79a4e86c8a336813c58c expecco_1_3_4
 76de19bec54bfa87495522090f7c89f854136bba rel4_1_7
--- a/Workspace.st	Fri Apr 29 06:55:43 2016 +0200
+++ b/Workspace.st	Sun May 01 06:37:41 2016 +0200
@@ -188,6 +188,8 @@
         'ien'   'isEmptyOrNil '
         'nen'   'notEmptyOrNil '
 
+        '[it'    '[] ifTrue:[!!'
+        '[if'    '[] ifFalse:[!!'
         'it'    'ifTrue:[!!'
         'if'    'ifFalse:[!!'
         'itf'   'ifTrue:[!!] ifFalse:[].'
@@ -227,6 +229,8 @@
         'inj'   'inject:!! into:[:accum :each | ]'
 
         'ex'    'Error handle:[ex | !!] do:[].'
+        '[ sh'  '[ self halt ].'
+        '[sh'   '[self halt].'
         'sh'    'self halt.'
         'mt'    'MessageTally spyOn:[!!].'
 
@@ -314,7 +318,7 @@
             at:abbrev put:text "/ ifPresent:[ self error:'duplicate abbreviation key' ]
     ].
 
-    "Modified: / 26-09-2012 / 14:48:42 / cg"
+    "Modified: / 30-04-2016 / 19:40:42 / cg"
 !
 
 updateStyleCache