Mercurial Mercurial > hg > stx-libscm / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed typo in AbstractFileBrowser>>hgMenuMerge:
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 18 Mar 2013 19:21:43 +0000
changeset 267 1bd4eaf81690
parent 266 af2b7ccf99c3
child 268 ceb9b128eeba
Fixed typo in AbstractFileBrowser>>hgMenuMerge:
mercurial/extensions.st file | annotate | diff | comparison | revisions 
--- a/mercurial/extensions.st	Mon Mar 18 19:18:45 2013 +0000
+++ b/mercurial/extensions.st	Mon Mar 18 19:21:43 2013 +0000
@@ -153,7 +153,7 @@
     [
         repo := self currentHgRepository.
         wc := repo workingCopy.
-        stream nextPutAll:(resources string: 'Mercurial > hg merge ') . anHGChangeset is printString.
+        stream nextPutAll:(resources string: 'Mercurial > hg merge ') . anHGChangeset id printString.
         wc merge: anHGChangeset.
         stream nextPutAll:(resources string: 'done'); cr.
         (wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each|
@@ -174,7 +174,7 @@
     ] forkAt: Processor userBackgroundPriority
 
     "Created: / 14-01-2013 / 21:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 13-03-2013 / 00:23:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-03-2013 / 19:19:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !AbstractFileBrowser methodsFor:'menu actions-scm-hg'!
hg/stx-libscm