class: AppiumConnectionEditor cvs_MAIN
authorClaus Gittinger <cg@exept.de>
Sun, 23 Feb 2020 13:42:16 +0100
branchcvs_MAIN
changeset 900 14eba1ab21c1
parent 898 38201b0a1248
child 901 97b6f939692c
class: AppiumConnectionEditor changed: #doAccept #doManageChromedriver
mercurial/extensions.st
--- a/mercurial/extensions.st	Wed Feb 19 21:08:02 2020 +0100
+++ b/mercurial/extensions.st	Sun Feb 23 13:42:16 2020 +0100
@@ -387,8 +387,7 @@
 
     appl := self openCommandResultApplication.
     stream := appl resultStream.
-    appl changeTabTo:((resources string:'Merging with %1') 
-                bindWith:anHGChangeset id printString).
+    appl changeTabTo:(resources string:'Merging with %1' with:anHGChangeset id printString).
     [
         repo := self currentHgRepository.
         wc := repo workingCopy.
@@ -404,8 +403,7 @@
             each isUnresolved ifTrue:[
                 | merger |
 
-                stream nextPutAll:((resources string:'Resolving conflicts %1...') 
-                            bindWith:each pathNameRelative).
+                stream nextPutAll:(resources string:'Resolving conflicts %1...' with:each pathNameRelative).
                 merger := HGMergeTool for:each.
                 merger premerge ifTrue:[
                     stream nextPutLine:(resources string:'resolved').