wix: avoid an abort with 'hg help -k foo' stable
authorMatt Harbison <matt_harbison@yahoo.com>
Tue, 01 Sep 2015 11:39:08 -0400
branchstable
changeset 26119 65d2538ac993
parent 26101 006870583088
child 26120 1a45e49a6bed
wix: avoid an abort with 'hg help -k foo' Previously: $ /c/Program\ Files/Mercurial/hg help -k merge-tools abort: No such file or directory: c:\Program Files\Mercurial\help\scripting.txt The Inno installer seems OK, but the TortoiseHg required the same fix. That got queued with an additional change of 'helpFolder.guid' in guids.wxi (probably by Steve). I'm not sure if that is necessary here too.
contrib/wix/help.wxs
--- a/contrib/wix/help.wxs	Mon Aug 31 23:14:58 2015 +0900
+++ b/contrib/wix/help.wxs	Tue Sep 01 11:39:08 2015 -0400
@@ -23,6 +23,7 @@
           <File Name="phases.txt" />
           <File Name="revisions.txt" />
           <File Name="revsets.txt" />
+          <File Name="scripting.txt" />
           <File Name="subrepos.txt" />
           <File Name="templates.txt" />
           <File Name="urls.txt" />