comparison contrib/wix/help.wxs @ 12790:6c619c2e8778

wix: add new merge-tools.txt help text
author Steve Borho <steve@borho.org>
date Wed, 20 Oct 2010 16:27:24 -0500
parents 159233cc9c14
children d8205dacf9a3
comparison
equal deleted inserted replaced
12789:24999db620cd 12790:6c619c2e8778
12 <File Name="diffs.txt" /> 12 <File Name="diffs.txt" />
13 <File Name="environment.txt" /> 13 <File Name="environment.txt" />
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" />
20 <File Name="revsets.txt" /> 21 <File Name="revsets.txt" />
21 <File Name="templates.txt" /> 22 <File Name="templates.txt" />