Mercurial Mercurial > hg > stx-libscm / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/extensions.st.rej
author Claus Gittinger <cg@exept.de>
Wed, 29 Aug 2018 12:46:21 +0200
branchcvs_MAIN
changeset 856 4d897e8ab998
parent 512 61df05330245
permissions -rw-r--r--
#REFACTORING by cg class: HGRevisionAnnotation removed: #annotatesClass: #annotatesMethod:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
512
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     1
 
--- mercurial/extensions.st	Wed Jan 14 10:02:24 2015 +0100
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     2
 
+++ mercurial/extensions.st	Fri Jan 16 10:40:29 2015 +0000
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     3
 
@@ -1373,17 +1522,16 @@
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     4
 
     "
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     5
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     6
 
     "Created: / 19-11-2012 / 21:39:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     7
 
+    "Modified: / 21-02-2014 / 00:10:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     8
 
 ! !
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     9
 
+!stx_libscm_mercurial class methodsFor:'documentation'!
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    10
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    11
 
+extensionsVersion_CVS
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    12
 
+    ^ '$Header: /cvs/stx/stx/libscm/mercurial/extensions.st.rej,v 1.1 2015-01-16 14:42:08 vrany Exp $'
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    13
 
+! !
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    14
 
 !stx_libscm_mercurial class methodsFor:'documentation'!
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    15
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    16
 
 extensionsVersion_HG
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    17
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    18
 
     ^ '$Changeset: <not expanded> $'
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    19
 
 ! !
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    20
 
-
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    21
 
-!stx_libscm_mercurial class methodsFor:'documentation'!
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    22
 
-
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    23
 
-extensionsVersion_CVS
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    24
 
-    ^ '$Header: /cvs/stx/stx/libscm/mercurial/extensions.st.rej,v 1.1 2015-01-16 14:42:08 vrany Exp $'
61df05330245 Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    25
 
-! !
hg/stx-libscm