##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

wix: add new merge-tools.txt help text
Steve Borho -
r12790:6c619c2e default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -15,7 +15,7 b''
15 <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
15 <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
16
16
17 <!-- help.wxs -->
17 <!-- help.wxs -->
18 <?define helpFolder.guid = {9B541469-9C9E-4F25-B88B-048487AA582D} ?>
18 <?define helpFolder.guid = {870F98CE-5BC1-4396-9228-CEB234DFEC97} ?>
19
19
20 <!-- i18n.wxs -->
20 <!-- i18n.wxs -->
21 <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
21 <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
Show file before | Show file after | Hide comments
@@ -14,6 +14,7 b''
14 <File Name="extensions.txt" />
14 <File Name="extensions.txt" />
15 <File Name="glossary.txt" />
15 <File Name="glossary.txt" />
16 <File Name="hgweb.txt" />
16 <File Name="hgweb.txt" />
17 <File Name="merge-tools.txt" />
17 <File Name="multirevs.txt" />
18 <File Name="multirevs.txt" />
18 <File Name="patterns.txt" />
19 <File Name="patterns.txt" />
19 <File Name="revisions.txt" />
20 <File Name="revisions.txt" />
General Comments 0
You need to be logged in to leave comments. Login now