--- a/mercurial/HGMergeToolStartup.st Thu Oct 08 12:52:31 2020 +0100
+++ b/mercurial/HGMergeToolStartup.st Mon Oct 26 11:01:31 2020 +0000
@@ -170,11 +170,13 @@
"
- HGMergeToolStartup main: #('/home/jv/Projects/SmalltalkX/sources/jv1_x32_lin/build/stx/libbasic/String.st')
- HGMergeToolStartup main: #('/home/jv/Projects/SmalltalkX/sources/jv1_x32_lin/build/stx/libbasic/Method.st')
+ HGMergeToolStartup main: #('-r' 'default' 'libbasic/String.st')
+ HGMergeToolStartup main: #('-r' 'default' 'libwidg2/TerminalView.st')
+ HGMergeToolStartup main: #('-r' 'default' 'libwidg2/VT100TerminalView.st')
"
"Modified: / 27-08-2020 / 10:13:19 / Jan Vrany <jan.vrany@labware.com>"
+ "Modified (comment): / 26-10-2020 / 10:29:53 / Jan Vrany <jan.vrany@labware.com>"
!
usage
@@ -189,3 +191,10 @@
"Modified: / 27-08-2020 / 09:42:00 / Jan Vrany <jan.vrany@labware.com>"
! !
+!HGMergeToolStartup class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+! !
+