changeset 178 | 1ed827252fee |
parent 177 | 1b0ddad9770e |
child 215 | 165ce6502156 |
--- a/mercurial/abbrev.stc Mon Jan 14 17:01:55 2013 +0000 +++ b/mercurial/abbrev.stc Mon Jan 14 22:16:57 2013 +0000 @@ -42,3 +42,4 @@ HGWorkingCopyBrowser HGWorkingCopyBrowser stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 3 HGMergeInfo HGMergeInfo stx:libscm/mercurial 'SCM-Mercurial-Core' 0 HGCachedFileData HGCachedFileData stx:libscm/mercurial 'SCM-Mercurial-Internal' 0 +HGMergeTool HGMergeTool stx:libscm/mercurial 'SCM-Mercurial-StX' 0