##// END OF EJS Templates
help: describe about choice of :prompt as a fallback merge tool explicitly...
help: describe about choice of :prompt as a fallback merge tool explicitly "merge-tools" help topic has described that the merge of the file fails if no tool is found to merge binary or symlink, since c77f6276c9e7 (or Mercurial 1.7), which based on (already removed) MergeProgram wiki page. But even at that revision, and of course now, merge of the file doesn't fail automatically for binary/symlink. ":prompt" (or equivalent logic) is used, if there is no appropriate tool configuration for binary/symlink.

File last commit:

r32178:3ada0443 stable
r32179:247bb7a2 stable
Show More
help.wxs
55 lines | 2.0 KiB | text/plain | TextLexer
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?xml version="1.0" encoding="utf-8"?>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<Fragment>
Matt Harbison
wix: add help for current internal topics...
r27684 <ComponentGroup Id='helpFolder'>
<ComponentRef Id='help.root' />
<ComponentRef Id='help.internals' />
</ComponentGroup>
</Fragment>
<Fragment>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <DirectoryRef Id="INSTALLDIR">
<Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
Matt Harbison
wix: add help for current internal topics...
r27684 <Component Id="help.root" Guid="$(var.help.root.guid)" Win64='$(var.IsX64)'>
Gregory Szorc
help: document bundle specifications...
r31793 <File Name="bundlespec.txt" />
Pierre-Yves David
color: update main documentation...
r31123 <File Name="color.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="config.txt" KeyPath="yes" />
<File Name="dates.txt" />
<File Name="diffs.txt" />
<File Name="environment.txt" />
<File Name="extensions.txt" />
Steve Borho
wix: catch up with more added files...
r14819 <File Name="filesets.txt" />
Steve Borho
wix: pick up new help topics added between 1.5 and 1.6...
r11491 <File Name="glossary.txt" />
Steve Borho
wix: catch up with more added files...
r14819 <File Name="hgignore.txt" />
Steve Borho
wix: pick up new help topics added between 1.5 and 1.6...
r11491 <File Name="hgweb.txt" />
Steve Borho
wix: add new merge-tools.txt help text
r12790 <File Name="merge-tools.txt" />
Matt Harbison
wix: include the help for pager...
r31098 <File Name="pager.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="patterns.txt" />
Steve Borho
wix: add phases help text and two more translations (issue 3288)
r16220 <File Name="phases.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="revisions.txt" />
Matt Harbison
wix: avoid an abort with 'hg help -k foo'...
r26119 <File Name="scripting.txt" />
Steve Borho
wix: add subrepos help text
r12830 <File Name="subrepos.txt" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="templates.txt" />
<File Name="urls.txt" />
</Component>
Matt Harbison
wix: add help for current internal topics...
r27684
<Directory Id="help.internaldir" Name="internals">
<Component Id="help.internals" Guid="$(var.help.internals.guid)" Win64='$(var.IsX64)'>
<File Id="internals.bundles.txt" Name="bundles.txt" KeyPath="yes" />
Steve Borho
wix: only one KeyPath is allowed per Component
r32178 <File Id="internals.censor.txt" Name="censor.txt" />
Matt Harbison
wix: add help for current internal topics...
r27684 <File Id="internals.changegroups.txt" Name="changegroups.txt" />
Gregory Szorc
help: document requirements...
r28523 <File Id="internals.requirements.txt" Name="requirements.txt" />
Matt Harbison
wix: add help for current internal topics...
r27684 <File Id="internals.revlogs.txt" Name="revlogs.txt" />
Gregory Szorc
help: internals topic for wire protocol...
r29859 <File Id="internals.wireprotocol.txt" Name="wireprotocol.txt" />
Matt Harbison
wix: add help for current internal topics...
r27684 </Component>
</Directory>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Directory>
</DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>