Mercurial > hg
view contrib/wix/help.wxs @ 27048:86290f6f6599
mergestate._resolve: handle change/delete conflicts
We will represent a deleted file as 'nullhex' in the in-memory and on-disk
merge states. We need to be able to create absentfilectxes in that case, and
delete the file from disk rather than try to write it out.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 20 Nov 2015 01:14:15 -0800 |
parents | 65d2538ac993 |
children | e9857fbfd072 |
line wrap: on
line source
<?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include guids.wxi ?> <?include defines.wxi ?> <Fragment> <DirectoryRef Id="INSTALLDIR"> <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)"> <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'> <File Name="config.txt" KeyPath="yes" /> <File Name="dates.txt" /> <File Name="diffs.txt" /> <File Name="environment.txt" /> <File Name="extensions.txt" /> <File Name="filesets.txt" /> <File Name="glossary.txt" /> <File Name="hgignore.txt" /> <File Name="hgweb.txt" /> <File Name="merge-tools.txt" /> <File Name="multirevs.txt" /> <File Name="patterns.txt" /> <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" /> </Component> </Directory> </DirectoryRef> </Fragment> </Wix>